From abf6346c5e65ec1ab1f83841e9bd07a2e301dde8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 22 Sep 2020 00:00:59 +0200 Subject: [PATCH 1/3] test/run-integration-tests: do not run the tests if only "clean" is passed --- test/run-integration-tests.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh index ac7a28cf2c..04b8385be9 100755 --- a/test/run-integration-tests.sh +++ b/test/run-integration-tests.sh @@ -7,7 +7,7 @@ if [ $# -gt 0 ]; then else args="setup run clean-again" fi -args_no_clean=$(sed -r 's/(^| )clean($| )/ /g' <<<$args) +args_no_clean=$(sed -r 's/\bclean\b//g' <<<$args) do_clean=$( [ "$args" = "$args_no_clean" ]; echo $? ) ninja -C "$BUILD_DIR" @@ -26,6 +26,8 @@ if [ $do_clean = 1 ]; then for TEST in TEST-??-* ; do ( set -x ; make -C "$TEST" "BUILD_DIR=$BUILD_DIR" clean ) done + + [ -n "$args_no_clean" ] || exit 0 fi pass_blacklist() { From 9309a23b9513f9e36a4e7c7c7d917444ee2d97bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 22 Sep 2020 18:26:28 +0200 Subject: [PATCH 2/3] test: switch TEST-02-CRYPTSETUP and TEST-24-UNITTESTS When tests are executed serially (the default), it seems better to launch the fairly generic test that runs the unittests early in the sequence. Right now the tests are ordered based on when they were written, but this doesn't make much sense. --- test/{TEST-02-CRYPTSETUP => TEST-02-UNITTESTS}/Makefile | 0 .../deny-list-ubuntu-ci-ppc64el | 0 test/{TEST-24-UNIT-TESTS => TEST-02-UNITTESTS}/test.sh | 2 +- test/{TEST-24-UNIT-TESTS => TEST-24-CRYPTSETUP}/Makefile | 0 test/{TEST-02-CRYPTSETUP => TEST-24-CRYPTSETUP}/test.sh | 2 +- test/units/testsuite-02.service | 5 ++--- test/units/{testsuite-24.sh => testsuite-02.sh} | 0 test/units/testsuite-24.service | 5 +++-- 8 files changed, 7 insertions(+), 7 deletions(-) rename test/{TEST-02-CRYPTSETUP => TEST-02-UNITTESTS}/Makefile (100%) rename test/{TEST-24-UNIT-TESTS => TEST-02-UNITTESTS}/deny-list-ubuntu-ci-ppc64el (100%) rename test/{TEST-24-UNIT-TESTS => TEST-02-UNITTESTS}/test.sh (98%) rename test/{TEST-24-UNIT-TESTS => TEST-24-CRYPTSETUP}/Makefile (100%) rename test/{TEST-02-CRYPTSETUP => TEST-24-CRYPTSETUP}/test.sh (99%) rename test/units/{testsuite-24.sh => testsuite-02.sh} (100%) diff --git a/test/TEST-02-CRYPTSETUP/Makefile b/test/TEST-02-UNITTESTS/Makefile similarity index 100% rename from test/TEST-02-CRYPTSETUP/Makefile rename to test/TEST-02-UNITTESTS/Makefile diff --git a/test/TEST-24-UNIT-TESTS/deny-list-ubuntu-ci-ppc64el b/test/TEST-02-UNITTESTS/deny-list-ubuntu-ci-ppc64el similarity index 100% rename from test/TEST-24-UNIT-TESTS/deny-list-ubuntu-ci-ppc64el rename to test/TEST-02-UNITTESTS/deny-list-ubuntu-ci-ppc64el diff --git a/test/TEST-24-UNIT-TESTS/test.sh b/test/TEST-02-UNITTESTS/test.sh similarity index 98% rename from test/TEST-24-UNIT-TESTS/test.sh rename to test/TEST-02-UNITTESTS/test.sh index e5553b0fb5..6143d3352b 100755 --- a/test/TEST-24-UNIT-TESTS/test.sh +++ b/test/TEST-02-UNITTESTS/test.sh @@ -60,4 +60,4 @@ check_result_qemu() { return $_ret } -do_test "$@" 24 +do_test "$@" 02 diff --git a/test/TEST-24-UNIT-TESTS/Makefile b/test/TEST-24-CRYPTSETUP/Makefile similarity index 100% rename from test/TEST-24-UNIT-TESTS/Makefile rename to test/TEST-24-CRYPTSETUP/Makefile diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-24-CRYPTSETUP/test.sh similarity index 99% rename from test/TEST-02-CRYPTSETUP/test.sh rename to test/TEST-24-CRYPTSETUP/test.sh index ef1811122e..2a6ad310ed 100755 --- a/test/TEST-02-CRYPTSETUP/test.sh +++ b/test/TEST-24-CRYPTSETUP/test.sh @@ -76,4 +76,4 @@ test_setup_cleanup() { cleanup_initdir } -do_test "$@" 02 +do_test "$@" 24 diff --git a/test/units/testsuite-02.service b/test/units/testsuite-02.service index 13e7ec3639..075e979d29 100644 --- a/test/units/testsuite-02.service +++ b/test/units/testsuite-02.service @@ -1,8 +1,7 @@ [Unit] -Description=TEST-02-CRYPTSETUP -After=multi-user.target +Description=TEST-02-UNITTESTS [Service] ExecStartPre=rm -f /failed /testok -ExecStart=sh -x -e -c 'mountpoint /var; systemctl --state=failed --no-legend --no-pager >/failed; echo OK >/testok' +ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh Type=oneshot diff --git a/test/units/testsuite-24.sh b/test/units/testsuite-02.sh similarity index 100% rename from test/units/testsuite-24.sh rename to test/units/testsuite-02.sh diff --git a/test/units/testsuite-24.service b/test/units/testsuite-24.service index 43d4816d48..e66f61388f 100644 --- a/test/units/testsuite-24.service +++ b/test/units/testsuite-24.service @@ -1,7 +1,8 @@ [Unit] -Description=TEST-24-UNIT-TESTS +Description=TEST-24-CRYPTSETUP +After=multi-user.target [Service] ExecStartPre=rm -f /failed /testok -ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh +ExecStart=sh -x -e -c 'mountpoint /var; systemctl --state=failed --no-legend --no-pager >/failed; echo OK >/testok' Type=oneshot From 0af05e485a3a88f454c714901eb6109307dc893e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 22 Sep 2020 19:05:17 +0200 Subject: [PATCH 3/3] test-seccomp: accept ENOSYS from sysctl(2) too It seems that kernel 5.9 started returning that. --- src/test/test-seccomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c index 697130e70c..8831d87fe7 100644 --- a/src/test/test-seccomp.c +++ b/src/test/test-seccomp.c @@ -318,7 +318,7 @@ static void test_protect_sysctl(void) { if (pid == 0) { #if defined __NR__sysctl && __NR__sysctl >= 0 assert_se(syscall(__NR__sysctl, NULL) < 0); - assert_se(errno == EFAULT); + assert_se(IN_SET(errno, EFAULT, ENOSYS)); #endif assert_se(seccomp_protect_sysctl() >= 0);