Hi Shuah,
Today's linux-next merge of the kselftest tree got a conflict in
tools/testing/selftests/powerpc/Makefile between commit a908f5de3b10
("selftests/powerpc: Rename TARGETS in powerpc selftests makefile")
from the powerpc-mpe tree and commit 6faeeea44b84 ("selftests: Add
install support for the powerpc tests") from the kselftest tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc tools/testing/selftests/powerpc/Makefile
index 27dff8241de3,2958fe9a74e9..000000000000
--- a/tools/testing/selftests/powerpc/Makefile
+++ b/tools/testing/selftests/powerpc/Makefile
@@@ -8,27 -8,41 +8,41 @@@ ifeq ($(ARCH),powerpc
GIT_VERSION = $(shell git describe --always --long --dirty || echo "unknown")
- CC := $(CROSS_COMPILE)$(CC)
CFLAGS := -Wall -O2 -flto -Wall -Werror -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CURDIR) $(CFLAGS)
- export CC CFLAGS
+ export CFLAGS
-TARGETS = pmu copyloops mm tm primitives stringloops
+SUB_DIRS = pmu copyloops mm tm primitives stringloops vphn
endif
-all: $(TARGETS)
+all: $(SUB_DIRS)
-$(TARGETS):
+$(SUB_DIRS):
$(MAKE) -k -C $@ all
- run_tests: all
+ include ../lib.mk
+
+ override define RUN_TESTS
- @for TARGET in $(TARGETS); do \
+ @for TARGET in $(SUB_DIRS); do \
$(MAKE) -C $$TARGET run_tests; \
done;
+ endef
+
+ override define INSTALL_RULE
- @for TARGET in $(TARGETS); do \
++ @for TARGET in $(SUB_DIRS); do \
+ $(MAKE) -C $$TARGET install; \
+ done;
+ endef
+
+ override define EMIT_TESTS
- @for TARGET in $(TARGETS); do \
++ @for TARGET in $(SUB_DIRS); do \
+ $(MAKE) -s -C $$TARGET emit_tests; \
+ done;
+ endef
clean:
- @for TARGET in $(TARGETS); do \
+ @for TARGET in $(SUB_DIRS); do \
$(MAKE) -C $$TARGET clean; \
done;
rm -f tags
@@@ -36,4 -50,4 +50,4 @@@
tags:
find . -name '*.c' -o -name '*.h' | xargs ctags
- .PHONY: all run_tests clean tags $(SUB_DIRS)
-.PHONY: tags $(TARGETS)
++.PHONY: tags $(SUB_DIRS)
Attachment:
pgpvf1r2Rt6U3.pgp
Description: OpenPGP digital signature
