| Message ID | 20190925132421.23572-2-cristian.marussi@arm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] kselftest: add capability to skip chosen TARGETS | expand |
On 9/25/19 7:24 AM, Cristian Marussi wrote: > A TARGET which failed to be built/installed should not be included in the > runlist generated inside the run_kselftest.sh script. > > Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> > --- > As an example, here BPF failed to compile but was included in the runlist > and attempted to run anyway: > > ... > ./KSFT_LAST_2/run_kselftest.sh: 37: cd: can't cd to bpf > TAP version 13 > 1..49 > \# selftests: KSFT_LAST_2: test_verifier > \# Warning: file test_verifier is missing! > not ok 1 selftests: KSFT_LAST_2: test_verifier > \# selftests: KSFT_LAST_2: test_tag > \# Warning: file test_tag is missing! > --- > tools/testing/selftests/Makefile | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile > index 103936faa46d..e11ace11b07c 100644 > --- a/tools/testing/selftests/Makefile > +++ b/tools/testing/selftests/Makefile > @@ -202,8 +202,12 @@ ifdef INSTALL_PATH > echo " cat /dev/null > \$$logfile" >> $(ALL_SCRIPT) > echo "fi" >> $(ALL_SCRIPT) > > + @# While building run_kselftest.sh skip also non-existent TARGET dirs: > + @# they could be the result of a build failure and should NOT be > + @# included in the generated runlist. > for TARGET in $(TARGETS); do \ > BUILD_TARGET=$$BUILD/$$TARGET; \ > + [ ! -d $$INSTALL_PATH/$$TARGET ] && echo "Skipping non-existent dir: $$TARGET" && continue; \ > 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); \ > This is great. Thanks for the patch. -- Shuah
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 103936faa46d..e11ace11b07c 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -202,8 +202,12 @@ ifdef INSTALL_PATH echo " cat /dev/null > \$$logfile" >> $(ALL_SCRIPT) echo "fi" >> $(ALL_SCRIPT) + @# While building run_kselftest.sh skip also non-existent TARGET dirs: + @# they could be the result of a build failure and should NOT be + @# included in the generated runlist. for TARGET in $(TARGETS); do \ BUILD_TARGET=$$BUILD/$$TARGET; \ + [ ! -d $$INSTALL_PATH/$$TARGET ] && echo "Skipping non-existent dir: $$TARGET" && continue; \ 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); \
A TARGET which failed to be built/installed should not be included in the runlist generated inside the run_kselftest.sh script. Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> --- As an example, here BPF failed to compile but was included in the runlist and attempted to run anyway: ... ./KSFT_LAST_2/run_kselftest.sh: 37: cd: can't cd to bpf TAP version 13 1..49 \# selftests: KSFT_LAST_2: test_verifier \# Warning: file test_verifier is missing! not ok 1 selftests: KSFT_LAST_2: test_verifier \# selftests: KSFT_LAST_2: test_tag \# Warning: file test_tag is missing! --- tools/testing/selftests/Makefile | 4 ++++ 1 file changed, 4 insertions(+)