On Fri, 28 Sep 2018 at 07:43, Michael Ellerman <m...@ellerman.id.au> wrote:
>
> Commit b2d35fa5fc80 ("selftests: add headers_install to lib.mk")
> introduced a requirement that Makefiles more than one level below the
> selftests directory need to define top_srcdir, but it didn't update
> any of the powerpc Makefiles.
>
> This broke building all the powerpc selftests with eg:
>
> make[1]: Entering directory '/src/linux/tools/testing/selftests/powerpc'
> BUILD_TARGET=/src/linux/tools/testing/selftests/powerpc/alignment; mkdir -p
> $BUILD_TARGET; make OUTPUT=$BUILD_TARGET -k -C alignment all
> make[2]: Entering directory
> '/src/linux/tools/testing/selftests/powerpc/alignment'
> ../../lib.mk:20: ../../../../scripts/subarch.include: No such file or
> directory
> make[2]: *** No rule to make target '../../../../scripts/subarch.include'.
> make[2]: Failed to remake makefile '../../../../scripts/subarch.include'.
> Makefile:38: recipe for target 'alignment' failed
>
> Fix it by setting top_srcdir in the affected Makefiles.
>
> Fixes: b2d35fa5fc80 ("selftests: add headers_install to lib.mk")
> Signed-off-by: Michael Ellerman <m...@ellerman.id.au>
oops, I'm sorry =/
Reviewed-by: Anders Roxell <anders.rox...@linaro.org>
> ---
> tools/testing/selftests/powerpc/alignment/Makefile | 1 +
> tools/testing/selftests/powerpc/benchmarks/Makefile | 1 +
> tools/testing/selftests/powerpc/cache_shape/Makefile | 1 +
> tools/testing/selftests/powerpc/copyloops/Makefile | 1 +
> tools/testing/selftests/powerpc/dscr/Makefile | 1 +
> tools/testing/selftests/powerpc/math/Makefile | 1 +
> tools/testing/selftests/powerpc/mm/Makefile | 1 +
> tools/testing/selftests/powerpc/pmu/Makefile | 1 +
> tools/testing/selftests/powerpc/pmu/ebb/Makefile | 1 +
> tools/testing/selftests/powerpc/primitives/Makefile | 1 +
> tools/testing/selftests/powerpc/ptrace/Makefile | 1 +
> tools/testing/selftests/powerpc/signal/Makefile | 1 +
> tools/testing/selftests/powerpc/stringloops/Makefile | 1 +
> tools/testing/selftests/powerpc/switch_endian/Makefile | 1 +
> tools/testing/selftests/powerpc/syscalls/Makefile | 1 +
> tools/testing/selftests/powerpc/tm/Makefile | 1 +
> tools/testing/selftests/powerpc/vphn/Makefile | 1 +
> 17 files changed, 17 insertions(+)
>
> diff --git a/tools/testing/selftests/powerpc/alignment/Makefile
> b/tools/testing/selftests/powerpc/alignment/Makefile
> index 93baacab7693..d056486f49de 100644
> --- a/tools/testing/selftests/powerpc/alignment/Makefile
> +++ b/tools/testing/selftests/powerpc/alignment/Makefile
> @@ -1,5 +1,6 @@
> TEST_GEN_PROGS := copy_first_unaligned alignment_handler
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(TEST_GEN_PROGS): ../harness.c ../utils.c
> diff --git a/tools/testing/selftests/powerpc/benchmarks/Makefile
> b/tools/testing/selftests/powerpc/benchmarks/Makefile
> index b4d7432a0ecd..d40300a65b42 100644
> --- a/tools/testing/selftests/powerpc/benchmarks/Makefile
> +++ b/tools/testing/selftests/powerpc/benchmarks/Makefile
> @@ -4,6 +4,7 @@ TEST_GEN_FILES := exec_target
>
> CFLAGS += -O2
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(TEST_GEN_PROGS): ../harness.c
> diff --git a/tools/testing/selftests/powerpc/cache_shape/Makefile
> b/tools/testing/selftests/powerpc/cache_shape/Makefile
> index 1be547434a49..ede4d3dae750 100644
> --- a/tools/testing/selftests/powerpc/cache_shape/Makefile
> +++ b/tools/testing/selftests/powerpc/cache_shape/Makefile
> @@ -5,6 +5,7 @@ all: $(TEST_PROGS)
>
> $(TEST_PROGS): ../harness.c ../utils.c
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> clean:
> diff --git a/tools/testing/selftests/powerpc/copyloops/Makefile
> b/tools/testing/selftests/powerpc/copyloops/Makefile
> index 1cf89a34d97c..44574f3818b3 100644
> --- a/tools/testing/selftests/powerpc/copyloops/Makefile
> +++ b/tools/testing/selftests/powerpc/copyloops/Makefile
> @@ -17,6 +17,7 @@ TEST_GEN_PROGS := copyuser_64_t0 copyuser_64_t1
> copyuser_64_t2 \
>
> EXTRA_SOURCES := validate.c ../harness.c stubs.S
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(OUTPUT)/copyuser_64_t%: copyuser_64.S $(EXTRA_SOURCES)
> diff --git a/tools/testing/selftests/powerpc/dscr/Makefile
> b/tools/testing/selftests/powerpc/dscr/Makefile
> index 55d7db7a616b..5df476364b4d 100644
> --- a/tools/testing/selftests/powerpc/dscr/Makefile
> +++ b/tools/testing/selftests/powerpc/dscr/Makefile
> @@ -3,6 +3,7 @@ TEST_GEN_PROGS := dscr_default_test dscr_explicit_test
> dscr_user_test \
> dscr_inherit_test dscr_inherit_exec_test dscr_sysfs_test \
> dscr_sysfs_thread_test
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(OUTPUT)/dscr_default_test: LDLIBS += -lpthread
> diff --git a/tools/testing/selftests/powerpc/math/Makefile
> b/tools/testing/selftests/powerpc/math/Makefile
> index 0dd3a01fdab9..11a10d7a2bbd 100644
> --- a/tools/testing/selftests/powerpc/math/Makefile
> +++ b/tools/testing/selftests/powerpc/math/Makefile
> @@ -1,6 +1,7 @@
> # SPDX-License-Identifier: GPL-2.0
> TEST_GEN_PROGS := fpu_syscall fpu_preempt fpu_signal vmx_syscall vmx_preempt
> vmx_signal vsx_preempt
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(TEST_GEN_PROGS): ../harness.c
> diff --git a/tools/testing/selftests/powerpc/mm/Makefile
> b/tools/testing/selftests/powerpc/mm/Makefile
> index 8ebbe96d80a8..33ced6e0ad25 100644
> --- a/tools/testing/selftests/powerpc/mm/Makefile
> +++ b/tools/testing/selftests/powerpc/mm/Makefile
> @@ -5,6 +5,7 @@ noarg:
> TEST_GEN_PROGS := hugetlb_vs_thp_test subpage_prot prot_sao segv_errors
> TEST_GEN_FILES := tempfile
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(TEST_GEN_PROGS): ../harness.c
> diff --git a/tools/testing/selftests/powerpc/pmu/Makefile
> b/tools/testing/selftests/powerpc/pmu/Makefile
> index 6e1629bf5b09..19046db995fe 100644
> --- a/tools/testing/selftests/powerpc/pmu/Makefile
> +++ b/tools/testing/selftests/powerpc/pmu/Makefile
> @@ -5,6 +5,7 @@ noarg:
> TEST_GEN_PROGS := count_instructions l3_bank_test per_event_excludes
> EXTRA_SOURCES := ../harness.c event.c lib.c ../utils.c
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> all: $(TEST_GEN_PROGS) ebb
> diff --git a/tools/testing/selftests/powerpc/pmu/ebb/Makefile
> b/tools/testing/selftests/powerpc/pmu/ebb/Makefile
> index c4e64bc2e265..bd5dfa509272 100644
> --- a/tools/testing/selftests/powerpc/pmu/ebb/Makefile
> +++ b/tools/testing/selftests/powerpc/pmu/ebb/Makefile
> @@ -17,6 +17,7 @@ TEST_GEN_PROGS := reg_access_test event_attributes_test
> cycles_test \
> lost_exception_test no_handler_test \
> cycles_with_mmcr2_test
>
> +top_srcdir = ../../../../../..
> include ../../../lib.mk
>
> $(TEST_GEN_PROGS): ../../harness.c ../../utils.c ../event.c ../lib.c \
> diff --git a/tools/testing/selftests/powerpc/primitives/Makefile
> b/tools/testing/selftests/powerpc/primitives/Makefile
> index 175366db7be8..ea2b7bd09e36 100644
> --- a/tools/testing/selftests/powerpc/primitives/Makefile
> +++ b/tools/testing/selftests/powerpc/primitives/Makefile
> @@ -2,6 +2,7 @@ CFLAGS += -I$(CURDIR)
>
> TEST_GEN_PROGS := load_unaligned_zeropad
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(TEST_GEN_PROGS): ../harness.c
> diff --git a/tools/testing/selftests/powerpc/ptrace/Makefile
> b/tools/testing/selftests/powerpc/ptrace/Makefile
> index 28f5b781a553..923d531265f8 100644
> --- a/tools/testing/selftests/powerpc/ptrace/Makefile
> +++ b/tools/testing/selftests/powerpc/ptrace/Makefile
> @@ -4,6 +4,7 @@ TEST_PROGS := ptrace-gpr ptrace-tm-gpr ptrace-tm-spd-gpr \
> ptrace-tm-spd-vsx ptrace-tm-spr ptrace-hwbreak ptrace-pkey
> core-pkey \
> perf-hwbreak
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> all: $(TEST_PROGS)
> diff --git a/tools/testing/selftests/powerpc/signal/Makefile
> b/tools/testing/selftests/powerpc/signal/Makefile
> index a7cbd5082e27..1fca25c6ace0 100644
> --- a/tools/testing/selftests/powerpc/signal/Makefile
> +++ b/tools/testing/selftests/powerpc/signal/Makefile
> @@ -8,6 +8,7 @@ $(TEST_PROGS): ../harness.c ../utils.c signal.S
> CFLAGS += -maltivec
> signal_tm: CFLAGS += -mhtm
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> clean:
> diff --git a/tools/testing/selftests/powerpc/stringloops/Makefile
> b/tools/testing/selftests/powerpc/stringloops/Makefile
> index 10b35c87a4f4..7fc0623d85c3 100644
> --- a/tools/testing/selftests/powerpc/stringloops/Makefile
> +++ b/tools/testing/selftests/powerpc/stringloops/Makefile
> @@ -29,6 +29,7 @@ endif
>
> ASFLAGS = $(CFLAGS)
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(TEST_GEN_PROGS): $(EXTRA_SOURCES)
> diff --git a/tools/testing/selftests/powerpc/switch_endian/Makefile
> b/tools/testing/selftests/powerpc/switch_endian/Makefile
> index 30b8ff8fb82e..fcd2dcb8972b 100644
> --- a/tools/testing/selftests/powerpc/switch_endian/Makefile
> +++ b/tools/testing/selftests/powerpc/switch_endian/Makefile
> @@ -5,6 +5,7 @@ ASFLAGS += -O2 -Wall -g -nostdlib -m64
>
> EXTRA_CLEAN = $(OUTPUT)/*.o $(OUTPUT)/check-reversed.S
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(OUTPUT)/switch_endian_test: $(OUTPUT)/check-reversed.S
> diff --git a/tools/testing/selftests/powerpc/syscalls/Makefile
> b/tools/testing/selftests/powerpc/syscalls/Makefile
> index da22ca7c38c1..161b8846336f 100644
> --- a/tools/testing/selftests/powerpc/syscalls/Makefile
> +++ b/tools/testing/selftests/powerpc/syscalls/Makefile
> @@ -2,6 +2,7 @@ TEST_GEN_PROGS := ipc_unmuxed
>
> CFLAGS += -I../../../../../usr/include
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(TEST_GEN_PROGS): ../harness.c
> diff --git a/tools/testing/selftests/powerpc/tm/Makefile
> b/tools/testing/selftests/powerpc/tm/Makefile
> index c0e45d2dde25..9fc2cf6fbc92 100644
> --- a/tools/testing/selftests/powerpc/tm/Makefile
> +++ b/tools/testing/selftests/powerpc/tm/Makefile
> @@ -6,6 +6,7 @@ TEST_GEN_PROGS := tm-resched-dscr tm-syscall
> tm-signal-msr-resv tm-signal-stack
> tm-vmxcopy tm-fork tm-tar tm-tmspr tm-vmx-unavail tm-unavailable
> tm-trap \
> $(SIGNAL_CONTEXT_CHK_TESTS) tm-sigreturn
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(TEST_GEN_PROGS): ../harness.c ../utils.c
> diff --git a/tools/testing/selftests/powerpc/vphn/Makefile
> b/tools/testing/selftests/powerpc/vphn/Makefile
> index f8ced26748f8..fb82068c9fda 100644
> --- a/tools/testing/selftests/powerpc/vphn/Makefile
> +++ b/tools/testing/selftests/powerpc/vphn/Makefile
> @@ -2,6 +2,7 @@ TEST_GEN_PROGS := test-vphn
>
> CFLAGS += -m64
>
> +top_srcdir = ../../../../..
> include ../../lib.mk
>
> $(TEST_GEN_PROGS): ../harness.c
> --
> 2.17.1
>
