September 2019 - Linux-kselftest-mirror

[PATCH v3 0/2] selftests: fix prepending $(OUTPUT) to $(TEST_PROGS)

by Ilya Leoshkevich

This patch series fixes the following problem: linux# make kselftest TARGETS=bpf O=/mnt/linux-build # selftests: bpf: test_libbpf.sh # ./test_libbpf.sh: line 23: ./test_libbpf_open: No such file or directory # test_libbpf: failed at file test_l4lb.o # selftests: test_libbpf [FAILED] Patch 1 appends / to $(OUTPUT) in order to make it more uniform with the rest of the tree. Patch 2 fixes the problem by prepending $(OUTPUT) to all members of $(TEST_PROGS). v1->v2: - Append / to $(OUTPUT). - Use $(addprefix) instead of $(foreach). v2->v3: - Split the patch in two. - Improve the commit message. Ilya Leoshkevich (2): selftests: append / to $(OUTPUT) selftests: fix prepending $(OUTPUT) to $(TEST_PROGS) tools/testing/selftests/Makefile | 16 ++++++++-------- tools/testing/selftests/lib.mk | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) -- 2.23.0

5 years

1
2
0 0

[PATCH v2] selftests: fix prepending $(OUTPUT) to $(TEST_PROGS)

by Ilya Leoshkevich

The current logic prepends $(OUTPUT) only to the first member of $(TEST_PROGS). Use $(addprefix) to prepend it to each member. Also, $(OUTPUT) is assumed to end with a / almost everywhere else in the kernel, make this the case for kselftest as well. Fixes: 1a940687e424 ("selftests: lib.mk: copy test scripts and test files for make O=dir run") Signed-off-by: Ilya Leoshkevich <iii(a)linux.ibm.com> --- v1->v2: - Append / to $(OUTPUT). - Use $(addprefix) instead of $(foreach). tools/testing/selftests/Makefile | 16 ++++++++-------- tools/testing/selftests/lib.mk | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index c3feccb99ff5..49bcd066907e 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -136,31 +136,31 @@ all: khdr @for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ mkdir $$BUILD_TARGET -p; \ - $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET;\ + $(MAKE) OUTPUT=$$BUILD_TARGET/ -C $$TARGET;\ done; run_tests: all @for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ - $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests;\ + $(MAKE) OUTPUT=$$BUILD_TARGET/ -C $$TARGET run_tests;\ done; hotplug: @for TARGET in $(TARGETS_HOTPLUG); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ - $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET;\ + $(MAKE) OUTPUT=$$BUILD_TARGET/ -C $$TARGET;\ done; run_hotplug: hotplug @for TARGET in $(TARGETS_HOTPLUG); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ - $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_full_test;\ + $(MAKE) OUTPUT=$$BUILD_TARGET/ -C $$TARGET run_full_test;\ done; clean_hotplug: @for TARGET in $(TARGETS_HOTPLUG); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ - $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\ + $(MAKE) OUTPUT=$$BUILD_TARGET/ -C $$TARGET clean;\ done; run_pstore_crash: @@ -184,7 +184,7 @@ ifdef INSTALL_PATH install -m 744 kselftest/prefix.pl $(INSTALL_PATH)/kselftest/ @for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ - $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \ + $(MAKE) OUTPUT=$$BUILD_TARGET/ -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; \ done; @# Ask all targets to emit their test scripts @@ -203,7 +203,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); \ - $(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET -C $$TARGET emit_tests >> $(ALL_SCRIPT); \ + $(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET/ -C $$TARGET emit_tests >> $(ALL_SCRIPT); \ echo "" >> $(ALL_SCRIPT); \ echo "cd \$$ROOT" >> $(ALL_SCRIPT); \ done; @@ -216,7 +216,7 @@ endif clean: @for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ - $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean;\ + $(MAKE) OUTPUT=$$BUILD_TARGET/ -C $$TARGET clean;\ done; .PHONY: khdr all run_tests hotplug run_hotplug clean_hotplug run_pstore_crash install clean diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 1c8a1963d03f..27a97a1b4e9e 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -75,7 +75,8 @@ ifdef building_out_of_srctree @rsync -aq $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT) fi @if [ "X$(TEST_PROGS)" != "X" ]; then - $(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(OUTPUT)/$(TEST_PROGS)) + $(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) \ + $(addprefix $(OUTPUT),$(TEST_PROGS))) else $(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS)) fi -- 2.21.0

5 years

2
2
0 0

[PATCH] selftests: update .gitignore files for selftests/bpf and selftests/zram

by Anatoly Pugachev

selftests: update .gitignore files for selftests/bpf and selftests/zram Signed-off-by: Anatoly Pugachev <matorola(a)gmail.com> --- tools/testing/selftests/bpf/.gitignore | 4 ++++ tools/testing/selftests/zram/.gitignore | 1 + 2 files changed, 5 insertions(+) create mode 100644 tools/testing/selftests/zram/.gitignore diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore index 7470327edcfe..218ac37f460a 100644 --- a/tools/testing/selftests/bpf/.gitignore +++ b/tools/testing/selftests/bpf/.gitignore @@ -15,6 +15,9 @@ test_libbpf_open test_sock test_sock_addr test_sock_fields +test_sockopt +test_sockopt_multi +test_sockopt_sk urandom_read test_btf test_sockmap @@ -32,6 +35,7 @@ test_section_names test_tcpnotify_user test_libbpf test_tcp_check_syncookie_user +test_tcp_rtt test_sysctl alu32 libbpf.pc diff --git a/tools/testing/selftests/zram/.gitignore b/tools/testing/selftests/zram/.gitignore new file mode 100644 index 000000000000..b4a2cb6fafa6 --- /dev/null +++ b/tools/testing/selftests/zram/.gitignore @@ -0,0 +1 @@ +err.log -- 2.23.0

5 years

3
3
0 0

[PATCH 0/2] Simplify kselftest build and install use-cases

by Shuah Khan

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(-) -- 2.20.1

5 years

2
4
0 0

[GIT PULL] Kselftest update for Linux 5.4-rc1

by Shuah Khan

Hi Linus, Please pull the following Kselftest update for Linux 5.4-rc1. This Kselftest update for Linux 5.4-rc1 consists of several fixes to existing tests. diff is attached. This pull has just the ksleftest patches I sent in my previous pull request. I dropped the KUnit patches and rebased. I will send another pull request for the KUnit work later on this week. Please note that there is conflict between tools/testing/selftests/tpm2/Makefile between commit: 3fb2179b0f3553a ("selftests/tpm2: Add the missing TEST_FILES assignment") from the tpmdd tree and commit: d04e26067d13f01 ("selftests: tpm2: install python files") Please take the fix from kselftest tree which is the correct version for this change. d04e26067d13f01 ("selftests: tpm2: install python files") Please let me know if you have any questions and/or concerns. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1: Linux 5.3-rc5 (2019-08-18 14:31:08 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.4-rc1.1 for you to fetch changes up to 721cb3c8bc8890e824b7be53bf951960ff7811f9: selftests: tpm2: install python files (2019-09-23 08:33:16 -0600) ---------------------------------------------------------------- linux-kselftest-5.4-rc1.1 This Kselftest update for Linux 5.4-rc1 consists of fixes to existing tests. ---------------------------------------------------------------- Anders Roxell (2): selftests: livepatch: add missing fragments to config selftests: tpm2: install python files George G. Davis (2): selftests: watchdog: Add optional file argument selftests: watchdog: cleanup whitespace in usage options Ilya Leoshkevich (1): selftests: use "$(MAKE)" instead of "make" Masanari Iida (1): selftest/ftrace: Fix typo in trigger-snapshot.tc Tycho Andersen (1): selftests/seccomp: fix build on older kernels tools/testing/selftests/Makefile | 22 ++++++------ .../ftrace/test.d/trigger/trigger-snapshot.tc | 2 +- tools/testing/selftests/livepatch/config | 2 ++ tools/testing/selftests/seccomp/seccomp_bpf.c | 5 +++ tools/testing/selftests/tpm2/Makefile | 1 + tools/testing/selftests/watchdog/watchdog-test.c | 41 +++++++++++++++------- 6 files changed, 48 insertions(+), 25 deletions(-) ----------------------------------------------------------------

5 years

2
1
0 0

[PATCH 0/3] selftests: netfilter: introduce test cases for ipvs

by Haishuang Yan

This series patch include test cases for ipvs. The test topology is who as below: +--------------------------------------------------------------+ | | | | ns0 | ns1 | | ----------- | ----------- ----------- | | | veth01 | --------- | veth10 | | veth12 | | | ----------- peer ----------- ----------- | | | | | | | ----------- | | | | | br0 | |----------------- peer |--------------| | ----------- | | | | | | | | | ---------- peer ---------- ----------- | | | veth02 | --------- | veth20 | | veth12 | | | ---------- | ---------- ----------- | | | ns2 | | | | +--------------------------------------------------------------+ Test results: # selftests: netfilter: ipvs.sh # Testing DR mode... # Testing NAT mode... # Testing Tunnel mode... # ipvs.sh: PASS ok 6 selftests: netfilter: ipvs.sh Haishuang Yan (3): selftests: netfilter: add ipvs test script selftests: netfilter: add ipvs nat test case selftests: netfilter: add ipvs tunnel test case tools/testing/selftests/netfilter/Makefile | 2 +- tools/testing/selftests/netfilter/ipvs.sh | 230 +++++++++++++++++++++++++++++ 2 files changed, 231 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/netfilter/ipvs.sh -- 1.8.3.1

5 years

2
4
0 0

[PATCH v2 0/2] Fix KSFT toplevel makefile behaviour

by Cristian Marussi

Hi so this series carries two small fixes to the toplevel KSelfTest makefile which I found useful especially while attempting to run the suite in automation. [1/2] While it is already possible to specify a limited list of TARGETS to run, it is not instead easily possible to state a list of targets NOT to run (say due to specific instability issues). Moreover providing such a skip list through a stripped down list of TARGETS it is cumbersome and fragile since this poses the risk to stick to an old stale stripped TARGETS list once upstream decides to add more default targets. A new SKIP_TARGETS Makefile variable is provided by this patch to easily specify a skiplist for target subsystems. [2/2] Currently when some target fails to build, KSFT Makefile just carries on building as much subsystems as it can: unfortunately this is not properly reflected also in the generation of the runlist inside run_kselftest.sh. This patch rectifies this behaviour checking for the existence of a target directory in the INSTALL_PATH before adding the related snippet to the run_kselftest.sh script. Thanks Cristian Changelog v1 --> v2 - added Documentation - various typos fixed - added a proper override when filtering-out SKIP_TARGETS from TARGETS to make it work also when TARGETS is provided too from the cmdline Cristian Marussi (2): kselftest: add capability to skip chosen TARGETS kselftest: exclude failed TARGETS from runlist Documentation/dev-tools/kselftest.rst | 11 +++++++++++ tools/testing/selftests/Makefile | 11 +++++++++++ 2 files changed, 22 insertions(+) -- 2.17.1

5 years

1
2
0 0

bug in KBUILD_OUTPUT handling - for relative paths in kselftest

by Tim.Bird＠sony.com

I found a bug in kselftest KBUILD_OUTPUT handling. The following works: $ cd /home/tbird/work/linux $ export KBUILD_OUTPUT=/home/tbird/work/kbuild $ yes '' | make localmodconfig $ make TARGETS=size kselftest But this doesn't work: $ cd /home/tbird/work/linux $ export KBUILD_OUTPUT=../kbuild $ yes '' | make localmodconfig $ make TARGETS=size kselftest I see the following: make[1]: Entering directory '/home/tbird/work/kbuild' make --no-builtin-rules INSTALL_HDR_PATH=$BUILD/usr \ ARCH=x86 -C ../../.. headers_install INSTALL ../kbuild/kselftest/usr/include gcc -static -ffreestanding -nostartfiles -s get_size.c -o ../kbuild/kselftest/size/get_size /usr/bin/ld: cannot open output file ../kbuild/kselftest/size/get_size: No such file or directory collect2: error: ld returned 1 exit status ../lib.mk:138: recipe for target '../kbuild/kselftest/size/get_size' failed make[3]: *** [../kbuild/kselftest/size/get_size] Error 1 Makefile:136: recipe for target 'all' failed make[2]: *** [all] Error 2 /home/tbird/work/linux/Makefile:1240: recipe for target 'kselftest' failed make[1]: *** [kselftest] Error 2 make[1]: Leaving directory '/home/tbird/work/kbuild' Makefile:179: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 This is due to the relative path for KBUILD_OUTPUT being handled incorrectly (I believe) in tools/testing/selftests/Makefile. There are these lines in the Makefile, which are responsible for creating the output directory: BUILD_TARGET=$$BUILD/$$TARGET mkdir $$BUILD_TARGET -p But these are executed from working directory tools/testing/selftests, so the 'size' directory gets created at tools/testing/kbuild/kselftest/size, instead of /home/tbird/work/kbuild/kselftest/size. I can add some code to the Makefile to change the assignment of the variable BUILD, so that if it is a relative path it is relative to $(top_srcdir) instead of the current directory. But I wanted to check and make sure that I'm not breaking anyone else's workflow. I'm not sure what the expectation would be for someone who did this: $ export KBUILD_OUTPUT=../kbuild ; make -C tools/testing/selftests run_tests But I assume if someone is running the kernel's 'make' from the top-level kernel source directory, and they have a relative KBUILD_OUTPUT directory, then they want that output directory to be relative to the top-level directory and not somewhere else. Should I just code up something for review? I use relative KBUILD_OUTPUT paths for a number of my kernel build scripts, and right now these are incompatible with kselftests. Thanks, -- Tim

5 years

2
1
0 0

[PATCH 1/2] kselftest: add capability to skip chosen TARGETS

by Cristian Marussi

Let the user specify an optional TARGETS skiplist through the new optional SKIP_TARGETS Makefile variable. It is easier to skip at will a reduced and well defined list of possibly problematic targets with SKIP_TARGETS then to provide a partially stripped down list of good targets using the usual TARGETS variable. Signed-off-by: Cristian Marussi <cristian.marussi(a)arm.com> --- tools/testing/selftests/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 25b43a8c2b15..103936faa46d 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -132,6 +132,10 @@ else ARCH=$(ARCH) -C $(top_srcdir) headers_install endif +# User can optionally provide a TARGETS skiplist. +SKIP_TARGETS ?= +TARGETS := $(filter-out $(SKIP_TARGETS), $(TARGETS)) + all: khdr @for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ -- 2.17.1

5 years

3
6
0 0

[GIT PULL] Kselftest update for Linux 5.4-rc1 (minus kunit)

by Shuah Khan

Hi Linus, Please pull the following Kselftest update for Linux 5.4-rc1 (minus kunit). This Kselftest update for Linux 5.4-rc1 consists of several fixes to existing tests. diff is attached. This pull has just the ksleftest patches I sent in my previous pull request. I dropped the KUnit patches and rebased. I will send another pull request for the KUnit work later on this week. Please note that there is conflict between tools/testing/selftests/tpm2/Makefile between commit: 3fb2179b0f3553a ("selftests/tpm2: Add the missing TEST_FILES assignment") from the tpmdd tree and commit: d04e26067d13f01 ("selftests: tpm2: install python files") Please take the fix from kselftest tree which is the correct version for this change. d04e26067d13f01 ("selftests: tpm2: install python files") Please let me know if you have any questions and/or concerns. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1: Linux 5.3-rc5 (2019-08-18 14:31:08 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.4-rc1.1 for you to fetch changes up to 721cb3c8bc8890e824b7be53bf951960ff7811f9: selftests: tpm2: install python files (2019-09-23 08:33:16 -0600) ---------------------------------------------------------------- linux-kselftest-5.4-rc1.1 This Kselftest update for Linux 5.4-rc1 consists of fixes to existing tests. ---------------------------------------------------------------- Anders Roxell (2): selftests: livepatch: add missing fragments to config selftests: tpm2: install python files George G. Davis (2): selftests: watchdog: Add optional file argument selftests: watchdog: cleanup whitespace in usage options Ilya Leoshkevich (1): selftests: use "$(MAKE)" instead of "make" Masanari Iida (1): selftest/ftrace: Fix typo in trigger-snapshot.tc Tycho Andersen (1): selftests/seccomp: fix build on older kernels tools/testing/selftests/Makefile | 22 ++++++------ .../ftrace/test.d/trigger/trigger-snapshot.tc | 2 +- tools/testing/selftests/livepatch/config | 2 ++ tools/testing/selftests/seccomp/seccomp_bpf.c | 5 +++ tools/testing/selftests/tpm2/Makefile | 1 + tools/testing/selftests/watchdog/watchdog-test.c | 41 +++++++++++++++------- 6 files changed, 48 insertions(+), 25 deletions(-) ----------------------------------------------------------------

5 years

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror September 2019