2022-08-31 21:38:53

by Axel Rasmussen

Subject: [PATCH] selftest: vm: remove orphaned references to local_config.{h,mk}

Note: this commit is intended to apply to mm-unstable, the commit being
fixed only exists in that branch for now.

Commit b4efb234e53cc60ccdc855190be9f35918687412 ("Kselftests: remove
support of libhugetlbfs from kselftests") removed the rule describing
how to build local_config.{h,mk}, but it left two references to these
files lingering around. The result is, none of the selftests could be
built due to dependencies with no rule for how to build them.

Signed-off-by: Axel Rasmussen <[email protected]>
---
tools/testing/selftests/vm/Makefile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
index b52f2cc51482..4ae879f70f4c 100644
--- a/tools/testing/selftests/vm/Makefile
+++ b/tools/testing/selftests/vm/Makefile
@@ -1,9 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
# Makefile for vm selftests

-LOCAL_HDRS += $(selfdir)/vm/local_config.h $(top_srcdir)/mm/gup_test.h
-
-include local_config.mk
+LOCAL_HDRS += $(top_srcdir)/mm/gup_test.h

uname_M := $(shell uname -m 2>/dev/null || echo not)
MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/ppc64/')
--
2.37.2.789.g6183377224-goog

2022-08-31 21:44:53

by Zach O'Keefe

Subject: Re: [PATCH] selftest: vm: remove orphaned references to local_config.{h,mk}

On Wed, Aug 31, 2022 at 2:16 PM Axel Rasmussen <[email protected]> wrote:
>
> Note: this commit is intended to apply to mm-unstable, the commit being
> fixed only exists in that branch for now.
>
> Commit b4efb234e53cc60ccdc855190be9f35918687412 ("Kselftests: remove
> support of libhugetlbfs from kselftests") removed the rule describing
> how to build local_config.{h,mk}, but it left two references to these
> files lingering around. The result is, none of the selftests could be
> built due to dependencies with no rule for how to build them.
>
> Signed-off-by: Axel Rasmussen <[email protected]>
> ---
> tools/testing/selftests/vm/Makefile | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile
> index b52f2cc51482..4ae879f70f4c 100644
> --- a/tools/testing/selftests/vm/Makefile
> +++ b/tools/testing/selftests/vm/Makefile
> @@ -1,9 +1,7 @@
> # SPDX-License-Identifier: GPL-2.0
> # Makefile for vm selftests
>
> -LOCAL_HDRS += $(selfdir)/vm/local_config.h $(top_srcdir)/mm/gup_test.h
> -
> -include local_config.mk
> +LOCAL_HDRS += $(top_srcdir)/mm/gup_test.h
>
> uname_M := $(shell uname -m 2>/dev/null || echo not)
> MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/ppc64/')
> --
> 2.37.2.789.g6183377224-goog
>

Thanks Axel! Works here on latest mm-unstable

Tested-by: Zach O'Keefe <[email protected]>

2022-09-01 09:37:46

by Tarun Sahu

Subject: Re: [PATCH] selftest: vm: remove orphaned references to local_config.{h,mk}

On Wed, 2022-08-31 at 14:15 -0700, Axel Rasmussen wrote:
> Note: this commit is intended to apply to mm-unstable, the commit
> being
> fixed only exists in that branch for now.
>
> Commit b4efb234e53cc60ccdc855190be9f35918687412 ("Kselftests: remove
> support of libhugetlbfs from kselftests") removed the rule describing
> how to build local_config.{h,mk}, but it left two references to these
> files lingering around. The result is, none of the selftests could be
> built due to dependencies with no rule for how to build them.
>
> Signed-off-by: Axel Rasmussen <[email protected]>
> ---
> tools/testing/selftests/vm/Makefile | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/vm/Makefile
> b/tools/testing/selftests/vm/Makefile
> index b52f2cc51482..4ae879f70f4c 100644
> --- a/tools/testing/selftests/vm/Makefile
> +++ b/tools/testing/selftests/vm/Makefile
> @@ -1,9 +1,7 @@
> # SPDX-License-Identifier: GPL-2.0
> # Makefile for vm selftests
>
> -LOCAL_HDRS += $(selfdir)/vm/local_config.h
> $(top_srcdir)/mm/gup_test.h
> -
> -include local_config.mk
> +LOCAL_HDRS += $(top_srcdir)/mm/gup_test.h
>
> uname_M := $(shell uname -m 2>/dev/null || echo not)
> MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e
> 's/ppc64.*/ppc64/')

Thanks, Alex. When I looked why it built in my case, The local_config
was part of .gitignore which "git clean" ignored and they resided there
and source was built without any problem.
I have submitted a new patch for updated .gitignore.