linux-kernel - linux-next: manual merge of the kselftest tree with the powerpc-mpe tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Tue, 24 Mar 2015 17:37:25 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Shuah Khan <shuahkh@....samsung.com>,
	Michael Ellerman <mpe@...erman.id.au>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	<linuxppc-dev@...ts.ozlabs.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sam Bobroff <sam.bobroff@....ibm.com>
Subject: linux-next: manual merge of the kselftest tree with the powerpc-mpe
 tree

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@...b.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)

Content of type "application/pgp-signature" skipped