diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2017-03-27 00:11:44 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-03-27 00:11:44 -0400 |
commit | 2db2c250dd3d1e74a50d4ab5f44c44ca5cb4e42b (patch) | |
tree | ad01e70917b4cb4d183c5bf551ae227e5354bc7f | |
parent | cc638a488a5205713b51eabd047be6ea641cc328 (diff) |
selftests/powerpc: Fix standalone powerpc build
The changes to enable building with a separate output directory, in
commit a8ba798bc8ec ("selftests: enable O and KBUILD_OUTPUT") broke
building the powerpc selftests on their own, eg:
$ cd tools/testing/selftests/powerpc; make
It was partially fixed in commit e53aff45c490 ("selftests: lib.mk Fix
individual test builds"), which defined OUTPUT for standalone tests. But
that only defines OUTPUT within the Makefile, the value is not exported
so sub-shells can't see it. We could export OUTPUT, but it's actually
cleaner to just expand the value of OUTPUT before we invoke the shell.
Fixes: a8ba798bc8ec ("selftests: enable O and KBUILD_OUTPUT")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | tools/testing/selftests/powerpc/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/testing/selftests/powerpc/Makefile b/tools/testing/selftests/powerpc/Makefile index 1c5d0575802e..bf13fc2297aa 100644 --- a/tools/testing/selftests/powerpc/Makefile +++ b/tools/testing/selftests/powerpc/Makefile | |||
@@ -34,34 +34,34 @@ endif | |||
34 | all: $(SUB_DIRS) | 34 | all: $(SUB_DIRS) |
35 | 35 | ||
36 | $(SUB_DIRS): | 36 | $(SUB_DIRS): |
37 | BUILD_TARGET=$$OUTPUT/$@; mkdir -p $$BUILD_TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -k -C $@ all | 37 | BUILD_TARGET=$(OUTPUT)/$@; mkdir -p $$BUILD_TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -k -C $@ all |
38 | 38 | ||
39 | include ../lib.mk | 39 | include ../lib.mk |
40 | 40 | ||
41 | override define RUN_TESTS | 41 | override define RUN_TESTS |
42 | @for TARGET in $(SUB_DIRS); do \ | 42 | @for TARGET in $(SUB_DIRS); do \ |
43 | BUILD_TARGET=$$OUTPUT/$$TARGET; \ | 43 | BUILD_TARGET=$(OUTPUT)/$$TARGET; \ |
44 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\ | 44 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\ |
45 | done; | 45 | done; |
46 | endef | 46 | endef |
47 | 47 | ||
48 | override define INSTALL_RULE | 48 | override define INSTALL_RULE |
49 | @for TARGET in $(SUB_DIRS); do \ | 49 | @for TARGET in $(SUB_DIRS); do \ |
50 | BUILD_TARGET=$$OUTPUT/$$TARGET; \ | 50 | BUILD_TARGET=$(OUTPUT)/$$TARGET; \ |
51 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install;\ | 51 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install;\ |
52 | done; | 52 | done; |
53 | endef | 53 | endef |
54 | 54 | ||
55 | override define EMIT_TESTS | 55 | override define EMIT_TESTS |
56 | @for TARGET in $(SUB_DIRS); do \ | 56 | @for TARGET in $(SUB_DIRS); do \ |
57 | BUILD_TARGET=$$OUTPUT/$$TARGET; \ | 57 | BUILD_TARGET=$(OUTPUT)/$$TARGET; \ |
58 | $(MAKE) OUTPUT=$$BUILD_TARGET -s -C $$TARGET emit_tests;\ | 58 | $(MAKE) OUTPUT=$$BUILD_TARGET -s -C $$TARGET emit_tests;\ |
59 | done; | 59 | done; |
60 | endef | 60 | endef |
61 | 61 | ||
62 | clean: | 62 | clean: |
63 | @for TARGET in $(SUB_DIRS); do \ | 63 | @for TARGET in $(SUB_DIRS); do \ |
64 | BUILD_TARGET=$$OUTPUT/$$TARGET; \ | 64 | BUILD_TARGET=$(OUTPUT)/$$TARGET; \ |
65 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean; \ | 65 | $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean; \ |
66 | done; | 66 | done; |
67 | rm -f tags | 67 | rm -f tags |