ACK: [Cosmic][SRU][PATCH 1/1] selftests/powerpc: Fix Makefiles for headers_install change

Kleber Souza kleber.souza at canonical.com
Mon Dec 17 13:10:54 UTC 2018 

On 12/14/18 10:39 AM, Po-Hsu Lin wrote:
> From: Michael Ellerman <mpe at ellerman.id.au>
>
> BugLink: https://bugs.launchpad.net/bugs/1808318
>
> 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 <mpe at ellerman.id.au>
> (cherry picked from commit 7e0cf1c983b5b24426d130fd949a055d520acc9a)
> Signed-off-by: Po-Hsu Lin <po-hsu.lin at canonical.com>


Acked-by: Kleber Sacilotto de Souza <kleber.souza at canonical.com>


> ---
>  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 083a48a..c3d5129 100644
> --- a/tools/testing/selftests/powerpc/alignment/Makefile
> +++ b/tools/testing/selftests/powerpc/alignment/Makefile
> @@ -1,6 +1,7 @@
>  TEST_GEN_PROGS := copy_unaligned copy_first_unaligned paste_unaligned \
>  	paste_last_unaligned alignment_handler
>  
> +top_srcdir = ../../../../..
>  include ../../lib.mk
>  
>  $(TEST_GEN_PROGS): ../harness.c ../utils.c copy_paste_unaligned_common.c
> diff --git a/tools/testing/selftests/powerpc/benchmarks/Makefile b/tools/testing/selftests/powerpc/benchmarks/Makefile
> index b4d7432..d40300a 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 1be5474..ede4d3d 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 eedce33..ccc90f8 100644
> --- a/tools/testing/selftests/powerpc/copyloops/Makefile
> +++ b/tools/testing/selftests/powerpc/copyloops/Makefile
> @@ -11,6 +11,7 @@ ASFLAGS = $(CFLAGS) -Wa,-mpower4
>  TEST_GEN_PROGS := copyuser_64 copyuser_power7 memcpy_64 memcpy_power7
>  EXTRA_SOURCES := validate.c ../harness.c
>  
> +top_srcdir = ../../../../..
>  include ../../lib.mk
>  
>  $(OUTPUT)/copyuser_64:     CPPFLAGS += -D COPY_LOOP=test___copy_tofrom_user_base
> diff --git a/tools/testing/selftests/powerpc/dscr/Makefile b/tools/testing/selftests/powerpc/dscr/Makefile
> index 55d7db7..5df4763 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 0dd3a01..11a10d7 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 8ebbe96..33ced6e 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 6e1629b..19046db 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 c4e64bc..bd5dfa5 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 175366d..ea2b7bd 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 28f5b78..923d531 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 a7cbd50..1fca25c 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 1125e48..bda0647 100644
> --- a/tools/testing/selftests/powerpc/stringloops/Makefile
> +++ b/tools/testing/selftests/powerpc/stringloops/Makefile
> @@ -6,6 +6,7 @@ CFLAGS += -I$(CURDIR)
>  TEST_GEN_PROGS := memcmp
>  EXTRA_SOURCES := memcmp_64.S ../harness.c
>  
> +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 30b8ff8..fcd2dcb 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 da22ca7..161b884 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 c0e45d2..9fc2cf6 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 f8ced26..fb82068 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

More information about the kernel-team mailing list