* linux-next: manual merge of the kselftest tree with the powerpc-mpe tree
@ 2015-03-24 6:37 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-03-24 6:37 UTC (permalink / raw)
To: Shuah Khan, Michael Ellerman, Benjamin Herrenschmidt, linuxppc-dev
Cc: linux-next, linux-kernel, Sam Bobroff
[-- Attachment #1: Type: text/plain, Size: 2138 bytes --]
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@canb.auug.org.au
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the kselftest tree with the powerpc-mpe tree
@ 2015-04-13 10:16 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-04-13 10:16 UTC (permalink / raw)
To: Shuah Khan, Michael Ellerman, Benjamin Herrenschmidt, linuxppc-dev
Cc: linux-next, linux-kernel, Sam bobroff
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
Hi Shuah,
Today's linux-next merge of the kselftest tree got a conflict in
tools/testing/selftests/powerpc/tm/Makefile between commit 7fe924d9d71c
("selftests/powerpc: Add transactional syscall test") 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@canb.auug.org.au
diff --cc tools/testing/selftests/powerpc/tm/Makefile
index 122cf1830de8,34f2ec634b40..000000000000
--- a/tools/testing/selftests/powerpc/tm/Makefile
+++ b/tools/testing/selftests/powerpc/tm/Makefile
@@@ -1,18 -1,10 +1,13 @@@
- PROGS := tm-resched-dscr tm-syscall
-TEST_PROGS := tm-resched-dscr
++TEST_PROGS := tm-resched-dscr tm-syscall
- all: $(PROGS)
+ all: $(TEST_PROGS)
- $(PROGS): ../harness.c
+ $(TEST_PROGS): ../harness.c
+tm-syscall: tm-syscall-asm.S
+tm-syscall: CFLAGS += -mhtm
+
- run_tests: all
- @-for PROG in $(PROGS); do \
- ./$$PROG; \
- done;
+ include ../../lib.mk
clean:
- rm -f $(PROGS) *.o
-
- .PHONY: all run_tests clean
+ rm -f $(TEST_PROGS) *.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-04-13 10:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-24 6:37 linux-next: manual merge of the kselftest tree with the powerpc-mpe tree Stephen Rothwell
2015-04-13 10:16 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).