This patch set intends to fix the errors in install and run_tests when 'O=' is specified. such as `make O=/path/to/build TARGETS=net kselftest-install`
Li Zhijian (2): selftests/Makefile: Create BUILD_TARGET directory for INSTALL_DEP_TARGETS selftests/Makefile: add INSTALL_DEP_TARGETS to run_tests
tools/testing/selftests/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Similar to 'all' which will create BUILD_TARGET for TARGETS, we should create BUILD_TARGET directory for INSTALL_DEP_TARGETS before generate the binaries.
This helps to fix the following error for net target during kselftest-install: $ make O=$build/ kselftest-install TARGETS=net V=1 ... /usr/bin/ld: cannot open output file $O/kselftest/net/lib/csum: No such file or directory
Signed-off-by: Li Zhijian lizhijian@fujitsu.com --- tools/testing/selftests/Makefile | 1 + 1 file changed, 1 insertion(+)
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 2401e973c359..fcaebd122d64 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -263,6 +263,7 @@ ifdef INSTALL_PATH @ret=1; \ for TARGET in $(TARGETS) $(INSTALL_DEP_TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ + mkdir $$BUILD_TARGET -p; \ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install \ INSTALL_PATH=$(INSTALL_PATH)/$$TARGET \ SRC_PATH=$(shell readlink -e $$(pwd)) \
Similar to the installation process, run_tests out-of-tree requires copying TEST_FILES and TEST_INCLUDES to the OUTPUT directory.
The `net/lib` directory is a special case because it is a dependency for `net`. Therefore, it should be processed before `net`.
This patch fixes the following error: $ make O=$build/ TARGETS=net kselftest V=1 # selftests: net: rtnetlink.sh # lib.sh: line 5: $O/kselftest/net/lib/sh/defer.sh: No such file or directory # FAIL: cannot add dummy interface not ok 20 selftests: net: rtnetlink.sh # exit=1 # timeout set to 3600 # selftests: net: xfrm_policy.sh # lib.sh: line 5: $O/kselftest/net/lib/sh/defer.sh: No such file or directory
Signed-off-by: Li Zhijian lizhijian@fujitsu.com --- tools/testing/selftests/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index fcaebd122d64..326dfd6ec497 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -206,8 +206,9 @@ all: done; exit $$ret;
run_tests: all - @for TARGET in $(TARGETS); do \ + @for TARGET in $(INSTALL_DEP_TARGETS) $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ + mkdir -p $$BUILD_TARGET; \ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests \ SRC_PATH=$(shell readlink -e $$(pwd)) \ OBJ_PATH=$(BUILD) \
linux-kselftest-mirror@lists.linaro.org
-
Li Zhijian