Simplify kselftest build and install use-cases
Shuah Khan
maintainercover Simplify kselftest build and install use-cases
This patch series simplifies kselftest use-cases and addresses requests from developers and testers to add support for building and installing from the main Makefile.
Shuah Khan (2):
Makefile: Add kselftest_build target to build tests
selftests: Add kselftest_install target to main Makefile
Makefile | 8 ++++++++ tools/testing/selftests/Makefile | 8 ++++++-- tools/testing/selftests/kselftest_install.sh | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-)
Signature · 1 line
2.20.1
Shuah Khan
maintainerPATCH 1/2 Makefile: Add kselftest_build target to build tests
Add kselftest_build 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.
This change addresses requests from developers and testers to add support for building from the main Makefile.
--- Makefile | 4 ++++ 1 file changed, 4 insertions(+)
Makefile +4 -0
@@ -1233,6 +1233,10 @@ scripts_unifdef: scripts_basic # --------------------------------------------------------------------------- # Kernel selftest +PHONY += kselftest_build +kselftest_build: + $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests all + PHONY += kselftest kselftest: $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
Signature · 1 line
2.20.1
Shuah Khan
maintainerPATCH 2/2 selftests: Add kselftest_install target to main Makefile
In reply to Shuah KhanAdd 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.
--- Makefile | 4 ++++ tools/testing/selftests/Makefile | 8 ++++++-- tools/testing/selftests/kselftest_install.sh | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-)
Makefile +4 -0
@@ -1241,6 +1241,10 @@ PHONY += kselftest kselftest: $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests +PHONY += kselftest_install +kselftest_install: + $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests install + PHONY += kselftest-clean kselftest-clean: $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests clean
tools/testing/selftests/Makefile +6 -2
@@ -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 +KSFT_INSTALL_PATH := $(abspath $(KSFT_INSTALL_PATH)) +# Avoid changing the rest of the logic here and lib.mk. +INSTALL_PATH := $(KSFT_INSTALL_PATH) ALL_SCRIPT := $(INSTALL_PATH)/run_kselftest.sh install: all
@@ -203,6 +206,7 @@ ifdef INSTALL_PATH echo "[ -w /dev/kmsg ] && echo \"kselftest: Running tests in $$TARGET\" >> /dev/kmsg" >> $(ALL_SCRIPT); \ echo "cd $$TARGET" >> $(ALL_SCRIPT); \ echo -n "run_many" >> $(ALL_SCRIPT); \ + echo -n "Emit Tests for $$TARGET\n"; \ $(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \ echo "" >> $(ALL_SCRIPT); \ echo "cd \$$ROOT" >> $(ALL_SCRIPT); \
tools/testing/selftests/kselftest_install.sh +2 -2
@@ -24,12 +24,12 @@ main() echo "$0: Installing in specified location - $install_loc ..." fi - install_dir=$install_loc/kselftest + install_dir=$install_loc/kselftest_install # Create install directory mkdir -p $install_dir # Build tests - INSTALL_PATH=$install_dir make install + KSFT_INSTALL_PATH=$install_dir make install } main "$@"
Signature · 1 line
2.20.1
Re: [PATCH 2/2] selftests: Add kselftest_install target to main Makefile
Hi Shuah,
Quoted 5 lines · Shuah Khan
Add
kselftest_installtarget to install tests from the top levelMakefile. This is to simplify kselftest use-cases for CI and distributions where build and test systems are different.
Quoted 8 lines
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 runningkselftest_install.sh. Also fix theINSTALL_PATHvariable conflict between mainMakefile.Signed-off-by Shuah Khan <[email protected]>
So, if these two patches were applied, we would see the following:
PHONY += kselftest_buildkselftest_build:
$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests all
PHONY += kselftest
kselftest:
$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
PHONY += kselftest_installkselftest_install:
$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests install
PHONY += kselftest-clean
kselftest-clean:
$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests clean
I do not want to see this endless crap addition just for changing the working directory to $(srctree)/tools/testing/selftests
Why don't you use pattern rule?
Those will be reduced into the two rules.
PHONY += kselftest
kselftest:
$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
kselftest-%: FORCE
$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests $*
This also avoids your inconsistency about
"kselftest-" vs "kselftest_".
Given the existing "kselftest-clean" and "kselftest-merge", "kselftest_build" and "kselftest_install"
(using an underscore instead of n hyphen)
would add needless confusion.
Signature · 2 lines
Best Regards Masahiro Yamada
Shuah Khan
maintainerRe: [PATCH 2/2] selftests: Add kselftest_install target to main Makefile
Quoted 39 lines · Masahiro Yamada
Hi Shuah,
Quoted 5 lines · Shuah Khan
Add
kselftest_installtarget to install tests from the top levelMakefile. This is to simplify kselftest use-cases for CI and distributions where build and test systems are different.Quoted 8 lines
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 runningkselftest_install.sh. Also fix theINSTALL_PATHvariable conflict between mainMakefile.Signed-off-by Shuah Khan <[email protected]>So, if these two patches were applied, we would see the following:
PHONY +=
kselftest_buildkselftest_build:$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests allPHONY += kselftest
kselftest:$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_testsPHONY +=
kselftest_installkselftest_install:$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests installPHONY += kselftest-clean
kselftest-clean:$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests clean
Quoted 8 lines
I do not want to see this endless crap addition just for changing the working directory to $(srctree)/tools/testing/selftests
Why don't you use pattern rule?
Those will be reduced into the two rules.
I just didn't think about simplifying it. Thanks for being direct.
Quoted 11 lines
PHONY += kselftest
kselftest:$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_testskselftest-%: FORCE
$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests $*
Quoted 10 lines
This also avoids your inconsistency about
"kselftest-" vs "kselftest_".Given the existing "kselftest-clean" and "kselftest-merge", "
kselftest_build" and "kselftest_install"
(using an underscore instead of n hyphen)
would add needless confusion.
Done. Sending v2 with two patches collapsed into one.
thanks,
-- Shuah