* [RESEND][PATCH] selftests/vm: Fix vm tests build and run
@ 2020-02-10 7:35 Harish
2020-02-10 8:05 ` Christophe Leroy
2020-02-10 9:50 ` Michael Ellerman
0 siblings, 2 replies; 3+ messages in thread
From: Harish @ 2020-02-10 7:35 UTC (permalink / raw)
To: linuxppc-dev, mpe; +Cc: Harish
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(-)
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
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RESEND][PATCH] selftests/vm: Fix vm tests build and run
2020-02-10 7:35 [RESEND][PATCH] selftests/vm: Fix vm tests build and run Harish
@ 2020-02-10 8:05 ` Christophe Leroy
2020-02-10 9:50 ` Michael Ellerman
1 sibling, 0 replies; 3+ messages in thread
From: Christophe Leroy @ 2020-02-10 8:05 UTC (permalink / raw)
To: Harish, linuxppc-dev, mpe
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RESEND][PATCH] selftests/vm: Fix vm tests build and run
2020-02-10 7:35 [RESEND][PATCH] selftests/vm: Fix vm tests build and run Harish
2020-02-10 8:05 ` Christophe Leroy
@ 2020-02-10 9:50 ` Michael Ellerman
1 sibling, 0 replies; 3+ messages in thread
From: Michael Ellerman @ 2020-02-10 9:50 UTC (permalink / raw)
To: Harish, linuxppc-dev; +Cc: Harish
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-10 9:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-10 7:35 [RESEND][PATCH] selftests/vm: Fix vm tests build and run Harish
2020-02-10 8:05 ` Christophe Leroy
2020-02-10 9:50 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox