From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shuah Khan <shuahkh@osg.samsung.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sam Bobroff <sam.bobroff@au1.ibm.com>
Subject: linux-next: manual merge of the kselftest tree with the powerpc-mpe tree
Date: Tue, 24 Mar 2015 17:37:25 +1100 [thread overview]
Message-ID: <20150324173725.442f88c1@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2015-03-24 6:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-24 6:37 Stephen Rothwell [this message]
2015-04-13 10:16 linux-next: manual merge of the kselftest tree with the powerpc-mpe tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150324173725.442f88c1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=sam.bobroff@au1.ibm.com \
--cc=shuahkh@osg.samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).