On 10/16/19 10:08 AM, Shuah Khan wrote:
On 10/15/19 8:00 PM, Michael Ellerman wrote:
Hi Shuah,
I know this has been merged already, so this is just FYI and in case it
helps anyone else who's tracking down build failures.
Thanks for letting me know. I have been sending updates about
breakages. Will send an update with this info.
Sorry I didn't reply before you merged it, I was on leave.
Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx> writes:
Add kselftest-all target to build tests from the top level
Makefile. This is to simplify kselftest use-cases for CI and
distributions where build and test systems are different.
Current kselftest target builds and runs tests on a development
system which is a developer use-case.
Add kselftest-install target to install tests from the top level
Makefile. This is to simplify kselftest use-cases for CI and
distributions where build and test systems are different.
This change addresses requests from developers and testers to add
support for installing kselftest from the main Makefile.
In addition, make the install directory the same when install is
run using "make kselftest-install" or by running kselftest_install.sh.
Also fix the INSTALL_PATH variable conflict between main Makefile and
selftests Makefile.
...
diff --git a/tools/testing/selftests/Makefile
b/tools/testing/selftests/Makefile
index c3feccb99ff5..bad18145ed1a 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -171,9 +171,12 @@ run_pstore_crash:
# 1. output_dir=kernel_src
# 2. a separate output directory is specified using O= KBUILD_OUTPUT
# 3. a separate output directory is specified using KBUILD_OUTPUT
+# Avoid conflict with INSTALL_PATH set by the main Makefile
#
-INSTALL_PATH ?= $(BUILD)/install
-INSTALL_PATH := $(abspath $(INSTALL_PATH))
+KSFT_INSTALL_PATH ?= $(BUILD)/kselftest_install
This change broke all my CI, because the tests no longer install in the
place it's expecting them :/
Sorry about that.
I can fix it by explicitly specifying the install path in my CI scripts.
+KSFT_INSTALL_PATH := $(abspath $(KSFT_INSTALL_PATH))
+# Avoid changing the rest of the logic here and lib.mk.
+INSTALL_PATH := $(KSFT_INSTALL_PATH)
I searched all the selftests Makefiles for it and convinced myself that,
the above would take care of it for these cases. I searched powerpc
Makefiles so this doesn't break it. Didn't think about the CI.
android/Makefile: mkdir -p $(INSTALL_PATH)
android/Makefile: install -t $(INSTALL_PATH) $(TEST_PROGS)
$(TEST_PROGS_EXTENDED) $(TEST_FILES)
android/Makefile: $(MAKE) OUTPUT=$$BUILD_TARGET -C $$SUBDIR
INSTALL_PATH=$(INSTALL_PATH)/$$SUBDIR install; \
futex/Makefile: mkdir -p $(INSTALL_PATH)
futex/Makefile: install -t $(INSTALL_PATH) $(TEST_PROGS)
$(TEST_PROGS_EXTENDED) $(TEST_FILES)
futex/Makefile: $(MAKE) OUTPUT=$$BUILD_TARGET -C $$SUBDIR
INSTALL_PATH=$(INSTALL_PATH)/$$SUBDIR install; \
sparc64/Makefile: mkdir -p $(INSTALL_PATH)
sparc64/Makefile: install -t $(INSTALL_PATH) $(TEST_PROGS)
$(TEST_PROGS_EXTENDED) $(TEST_FILES)
sparc64/Makefile: $(MAKE) OUTPUT=$$BUILD_TARGET -C $$SUBDIR
INSTALL_PATH=$(INSTALL_PATH)/$$SUBDIR install; \
But because the over-rideable variable changed from INSTALL_PATH to
KSFT_INSTALL_PATH I will need to export both of them in order for my CI
to work with old and new kernels.
My mistake. I overlooked that this could be overridden and could
be in used in CI scripts.
Can you send me your CI script for testing my changes? I also want
to make sure I don't break your CI again.
thanks,
-- Shuah
