| Message ID | 20200210073521.14117-1-harish@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [RESEND] selftests/vm: Fix vm tests build and run | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (a5bc6e124219546a81ce334dc9b16483d55e9abf) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 24 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
Le 10/02/2020 à 08:35, Harish a écrit : > A recent change overrides the ARCH env variable and hence runs > using make fails with the following. > > $ make -C vm/ > make: Entering directory '/home/harish/linux/tools/testing/selftests/vm' > make --no-builtin-rules ARCH=ppc64le -C ../../../.. headers_install > make[1]: Entering directory '/home/harish/linux' > Makefile:652: arch/ppc64le/Makefile: No such file or directory > make[1]: *** No rule to make target 'arch/ppc64le/Makefile'. Stop. > make[1]: Leaving directory '/home/harish/linux' > make: *** [../lib.mk:50: khdr] Error 2 > make: Leaving directory '/home/harish/linux/tools/testing/selftests/vm' > > Patch fixes this issue and also handles ppc64/ppc64le archs to enable > few tests Isn't it the same as https://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=155975 ? Christophe > > Signed-off-by: Harish <harish@linux.ibm.com> > --- > tools/testing/selftests/vm/Makefile | 4 ++-- > tools/testing/selftests/vm/run_vmtests | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile > index 7f9a8a8c31da..49bb15be1447 100644 > --- a/tools/testing/selftests/vm/Makefile > +++ b/tools/testing/selftests/vm/Makefile > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0 > # Makefile for vm selftests > uname_M := $(shell uname -m 2>/dev/null || echo not) > -ARCH ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/') > +ARCH_USED ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/ppc64/') > > CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) > LDLIBS = -lrt > @@ -19,7 +19,7 @@ TEST_GEN_FILES += thuge-gen > TEST_GEN_FILES += transhuge-stress > TEST_GEN_FILES += userfaultfd > > -ifneq (,$(filter $(ARCH),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64)) > +ifneq (,$(filter $(ARCH_USED),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64)) > TEST_GEN_FILES += va_128TBswitch > TEST_GEN_FILES += virtual_address_range > endif > diff --git a/tools/testing/selftests/vm/run_vmtests b/tools/testing/selftests/vm/run_vmtests > index a692ea828317..da63dfb9713a 100755 > --- a/tools/testing/selftests/vm/run_vmtests > +++ b/tools/testing/selftests/vm/run_vmtests > @@ -61,7 +61,7 @@ fi > #filter 64bit architectures > ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64" > if [ -z $ARCH ]; then > - ARCH=`uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/'` > + ARCH=`uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/ppc64/'` > fi > VADDR64=0 > echo "$ARCH64STR" | grep $ARCH && VADDR64=1 >
Harish <harish@linux.ibm.com> writes: > A recent change overrides the ARCH env variable and hence runs > using make fails with the following. > > $ make -C vm/ > make: Entering directory '/home/harish/linux/tools/testing/selftests/vm' > make --no-builtin-rules ARCH=ppc64le -C ../../../.. headers_install > make[1]: Entering directory '/home/harish/linux' > Makefile:652: arch/ppc64le/Makefile: No such file or directory > make[1]: *** No rule to make target 'arch/ppc64le/Makefile'. Stop. > make[1]: Leaving directory '/home/harish/linux' > make: *** [../lib.mk:50: khdr] Error 2 > make: Leaving directory '/home/harish/linux/tools/testing/selftests/vm' > > Patch fixes this issue and also handles ppc64/ppc64le archs to enable > few tests > > Signed-off-by: Harish <harish@linux.ibm.com> > --- > tools/testing/selftests/vm/Makefile | 4 ++-- > tools/testing/selftests/vm/run_vmtests | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) I don't maintain the vm tests. You need to send the patch to the right people. But as Christophe points out I think Sandipan has already done that. cheers
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index 7f9a8a8c31da..49bb15be1447 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for vm selftests uname_M := $(shell uname -m 2>/dev/null || echo not) -ARCH ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/') +ARCH_USED ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/ppc64/') CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) LDLIBS = -lrt @@ -19,7 +19,7 @@ TEST_GEN_FILES += thuge-gen TEST_GEN_FILES += transhuge-stress TEST_GEN_FILES += userfaultfd -ifneq (,$(filter $(ARCH),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64)) +ifneq (,$(filter $(ARCH_USED),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64)) TEST_GEN_FILES += va_128TBswitch TEST_GEN_FILES += virtual_address_range endif diff --git a/tools/testing/selftests/vm/run_vmtests b/tools/testing/selftests/vm/run_vmtests index a692ea828317..da63dfb9713a 100755 --- a/tools/testing/selftests/vm/run_vmtests +++ b/tools/testing/selftests/vm/run_vmtests @@ -61,7 +61,7 @@ fi #filter 64bit architectures ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64" if [ -z $ARCH ]; then - ARCH=`uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/'` + ARCH=`uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/ppc64/'` fi VADDR64=0 echo "$ARCH64STR" | grep $ARCH && VADDR64=1
A recent change overrides the ARCH env variable and hence runs using make fails with the following. $ make -C vm/ make: Entering directory '/home/harish/linux/tools/testing/selftests/vm' make --no-builtin-rules ARCH=ppc64le -C ../../../.. headers_install make[1]: Entering directory '/home/harish/linux' Makefile:652: arch/ppc64le/Makefile: No such file or directory make[1]: *** No rule to make target 'arch/ppc64le/Makefile'. Stop. make[1]: Leaving directory '/home/harish/linux' make: *** [../lib.mk:50: khdr] Error 2 make: Leaving directory '/home/harish/linux/tools/testing/selftests/vm' Patch fixes this issue and also handles ppc64/ppc64le archs to enable few tests Signed-off-by: Harish <harish@linux.ibm.com> --- tools/testing/selftests/vm/Makefile | 4 ++-- tools/testing/selftests/vm/run_vmtests | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)