Hi Shuah,
Today's linux-next merge of the kselftest tree got a cselftests/kcmp:
Always try to build the testonflict in
tools/testing/selftests/kcmp/Makefile between commit 4c12df63f7ff ("")
from the kselftest-fixes tree and commit c0d8a9393efd
("selftests/kcmp: add install target to enable installing test") from
the kselftest tree.
I fixed it up (see below - probably some more could be done) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc tools/testing/selftests/kcmp/Makefile
index ff0eefdc6ceb,753890f8d3b7..000000000000
--- a/tools/testing/selftests/kcmp/Makefile
+++ b/tools/testing/selftests/kcmp/Makefile
@@@ -1,10 -1,48 +1,30 @@@
-uname_M := $(shell uname -m 2>/dev/null || echo not)
-ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/)
-ifeq ($(ARCH),i386)
- ARCH := x86
- CFLAGS := -DCONFIG_X86_32 -D__i386__
-endif
-ifeq ($(ARCH),x86_64)
- ARCH := x86
- CFLAGS := -DCONFIG_X86_64 -D__x86_64__
-endif
-
-CFLAGS += -I../../../../arch/x86/include/generated/
-CFLAGS += -I../../../../include/
+CC := $(CROSS_COMPILE)$(CC)
CFLAGS += -I../../../../usr/include/
-CFLAGS += -I../../../../arch/x86/include/
+ TEST_STR = ./kcmp_test || echo kcmp_test: [FAIL]
+
-all:
-ifeq ($(ARCH),x86)
- gcc $(CFLAGS) kcmp_test.c -o kcmp_test
-else
- echo "Not an x86 target, can't build kcmp selftest"
-endif
+all: kcmp_test
+ install:
+ ifdef INSTALL_KSFT_PATH
+ ifeq ($(ARCH),x86)
+ install ./kcmp_test $(INSTALL_KSFT_PATH)
+ @echo echo Start kcmp test .... >> $(KSELFTEST)
+ @echo "$(TEST_STR)" >> $(KSELFTEST)
+ @echo rm -f kcmp-test-file >> $(KSELFTEST)
+ @echo echo End kcmp test .... >> $(KSELFTEST)
+ @echo echo ============================== >> $(KSELFTEST)
+ else
+ @echo Not an x86 target, unable install kcmp selftests
+ endif
+ else
+ @echo Run make kselftest_install in top level source directory
+ endif
+
run_tests: all
- @./kcmp_test || echo "kcmp_test: [FAIL]"
+ ifeq ($(ARCH),x86)
+ @$(TEST_STR)
+ endif
clean:
$(RM) kcmp_test kcmp-test-file
Attachment:
pgplbY9oZJ6dk.pgp
Description: OpenPGP digital signature
