diff options
54 files changed, 67 insertions, 56 deletions
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 3de0e51d5a..d42c0df9a0 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -16,4 +16,4 @@ test_append_files() { cp -v "$TEST_UNITS_DIR"/{testsuite-01,end}.service "$TEST_UNITS_DIR/testsuite.target" "$dst" } -do_test "$@" 01 +do_test "$@" diff --git a/test/TEST-02-UNITTESTS/test.sh b/test/TEST-02-UNITTESTS/test.sh index f7545b7620..906d7cacd4 100755 --- a/test/TEST-02-UNITTESTS/test.sh +++ b/test/TEST-02-UNITTESTS/test.sh @@ -71,4 +71,4 @@ check_result_qemu() { return $ret } -do_test "$@" 02 +do_test "$@" diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh index d719238d1a..4ffa1bd6f4 100755 --- a/test/TEST-03-JOBS/test.sh +++ b/test/TEST-03-JOBS/test.sh @@ -8,4 +8,4 @@ IMAGE_NAME="default" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 03 +do_test "$@" diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh index 66182435da..3d7dff976b 100755 --- a/test/TEST-04-JOURNAL/test.sh +++ b/test/TEST-04-JOURNAL/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="Journal-related tests" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 04 +do_test "$@" diff --git a/test/TEST-05-RLIMITS/test.sh b/test/TEST-05-RLIMITS/test.sh index f95c198f1a..12b4530dd4 100755 --- a/test/TEST-05-RLIMITS/test.sh +++ b/test/TEST-05-RLIMITS/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="Resource limits-related tests" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 05 +do_test "$@" diff --git a/test/TEST-06-SELINUX/test.sh b/test/TEST-06-SELINUX/test.sh index 984caf4b4f..978c930b71 100755 --- a/test/TEST-06-SELINUX/test.sh +++ b/test/TEST-06-SELINUX/test.sh @@ -54,4 +54,4 @@ test_append_files() { ) } -do_test "$@" 06 +do_test "$@" diff --git a/test/TEST-07-ISSUE-1981/test.sh b/test/TEST-07-ISSUE-1981/test.sh index bcb7584cb1..d195dcf184 100755 --- a/test/TEST-07-ISSUE-1981/test.sh +++ b/test/TEST-07-ISSUE-1981/test.sh @@ -9,4 +9,4 @@ TEST_NO_QEMU=1 NSPAWN_TIMEOUT=30 -do_test "$@" 07 +do_test "$@" diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh index 0e66aa88de..76927be429 100755 --- a/test/TEST-08-ISSUE-2730/test.sh +++ b/test/TEST-08-ISSUE-2730/test.sh @@ -12,4 +12,4 @@ QEMU_TIMEOUT=300 FSTYPE=ext4 TEST_FORCE_NEWIMAGE=1 -do_test "$@" 08 +do_test "$@" diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh index 19eb3ac6b3..3c92efbcc2 100755 --- a/test/TEST-09-ISSUE-2691/test.sh +++ b/test/TEST-09-ISSUE-2691/test.sh @@ -9,4 +9,4 @@ TEST_NO_NSPAWN=1 QEMU_TIMEOUT=300 -do_test "$@" 09 +do_test "$@" diff --git a/test/TEST-10-ISSUE-2467/test.sh b/test/TEST-10-ISSUE-2467/test.sh index c0b8e27164..2a16ff3baa 100755 --- a/test/TEST-10-ISSUE-2467/test.sh +++ b/test/TEST-10-ISSUE-2467/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2467" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 10 +do_test "$@" diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh index e8189f5276..15ecbe51a3 100755 --- a/test/TEST-11-ISSUE-3166/test.sh +++ b/test/TEST-11-ISSUE-3166/test.sh @@ -7,4 +7,4 @@ TEST_NO_NSPAWN=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 11 +do_test "$@" diff --git a/test/TEST-12-ISSUE-3171/test.sh b/test/TEST-12-ISSUE-3171/test.sh index 52e33cdfdb..6e250b7669 100755 --- a/test/TEST-12-ISSUE-3171/test.sh +++ b/test/TEST-12-ISSUE-3171/test.sh @@ -7,4 +7,4 @@ TEST_NO_QEMU=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 12 +do_test "$@" diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh index 05a33e0716..18db8d4284 100755 --- a/test/TEST-13-NSPAWN-SMOKE/test.sh +++ b/test/TEST-13-NSPAWN-SMOKE/test.sh @@ -17,4 +17,4 @@ test_append_files() { ) } -do_test "$@" 13 +do_test "$@" diff --git a/test/TEST-14-MACHINE-ID/test.sh b/test/TEST-14-MACHINE-ID/test.sh index 3507915bb9..14d30ec1e1 100755 --- a/test/TEST-14-MACHINE-ID/test.sh +++ b/test/TEST-14-MACHINE-ID/test.sh @@ -12,4 +12,4 @@ test_append_files() { printf "556f48e837bc4424a710fa2e2c9d3e3c\ne3d\n" >"${1:?}/etc/machine-id" } -do_test "$@" 14 +do_test "$@" diff --git a/test/TEST-15-DROPIN/test.sh b/test/TEST-15-DROPIN/test.sh index 134ed7bba3..f4422d4c7f 100755 --- a/test/TEST-15-DROPIN/test.sh +++ b/test/TEST-15-DROPIN/test.sh @@ -7,4 +7,4 @@ TEST_NO_QEMU=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 15 +do_test "$@" diff --git a/test/TEST-16-EXTEND-TIMEOUT/test.sh b/test/TEST-16-EXTEND-TIMEOUT/test.sh index 60c0dd1ee2..dd43902967 100755 --- a/test/TEST-16-EXTEND-TIMEOUT/test.sh +++ b/test/TEST-16-EXTEND-TIMEOUT/test.sh @@ -8,4 +8,4 @@ TEST_NO_QEMU=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 16 +do_test "$@" diff --git a/test/TEST-17-UDEV/test.sh b/test/TEST-17-UDEV/test.sh index 2a4cef2fa5..43119d4c10 100755 --- a/test/TEST-17-UDEV/test.sh +++ b/test/TEST-17-UDEV/test.sh @@ -17,4 +17,4 @@ test_append_files() { ) } -do_test "$@" 17 +do_test "$@" diff --git a/test/TEST-18-FAILUREACTION/test.sh b/test/TEST-18-FAILUREACTION/test.sh index 913c254f5d..2e7ed0c2d6 100755 --- a/test/TEST-18-FAILUREACTION/test.sh +++ b/test/TEST-18-FAILUREACTION/test.sh @@ -8,4 +8,4 @@ TEST_DESCRIPTION="FailureAction= operation" QEMU_TIMEOUT=600 -do_test "$@" 18 +do_test "$@" diff --git a/test/TEST-19-DELEGATE/test.sh b/test/TEST-19-DELEGATE/test.sh index a25c28ef4e..165b31f787 100755 --- a/test/TEST-19-DELEGATE/test.sh +++ b/test/TEST-19-DELEGATE/test.sh @@ -10,4 +10,4 @@ TEST_NO_NSPAWN=1 QEMU_TIMEOUT=600 UNIFIED_CGROUP_HIERARCHY=yes -do_test "$@" 19 +do_test "$@" diff --git a/test/TEST-20-MAINPIDGAMES/test.sh b/test/TEST-20-MAINPIDGAMES/test.sh index 96c85db909..bb9ddcde22 100755 --- a/test/TEST-20-MAINPIDGAMES/test.sh +++ b/test/TEST-20-MAINPIDGAMES/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test changing main PID" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 20 +do_test "$@" diff --git a/test/TEST-22-TMPFILES/test.sh b/test/TEST-22-TMPFILES/test.sh index 7038864deb..2d4d4d92c9 100755 --- a/test/TEST-22-TMPFILES/test.sh +++ b/test/TEST-22-TMPFILES/test.sh @@ -18,4 +18,4 @@ test_append_files() { fi } -do_test "$@" 22 +do_test "$@" diff --git a/test/TEST-23-TYPE-EXEC/test.sh b/test/TEST-23-TYPE-EXEC/test.sh index 2d1b938071..fb77dc7ab3 100755 --- a/test/TEST-23-TYPE-EXEC/test.sh +++ b/test/TEST-23-TYPE-EXEC/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test Type=exec" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 23 +do_test "$@" diff --git a/test/TEST-24-CRYPTSETUP/test.sh b/test/TEST-24-CRYPTSETUP/test.sh index 109d403568..2c13126a43 100755 --- a/test/TEST-24-CRYPTSETUP/test.sh +++ b/test/TEST-24-CRYPTSETUP/test.sh @@ -86,4 +86,4 @@ test_setup_cleanup() { cleanup_initdir } -do_test "$@" 24 +do_test "$@" diff --git a/test/TEST-25-IMPORT/test.sh b/test/TEST-25-IMPORT/test.sh index 51dae2d887..6fff9e5108 100755 --- a/test/TEST-25-IMPORT/test.sh +++ b/test/TEST-25-IMPORT/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test importd" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 25 +do_test "$@" diff --git a/test/TEST-26-SETENV/test.sh b/test/TEST-26-SETENV/test.sh index 2523e20929..fe4c517895 100755 --- a/test/TEST-26-SETENV/test.sh +++ b/test/TEST-26-SETENV/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test setenv" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 26 +do_test "$@" diff --git a/test/TEST-27-STDOUTFILE/test.sh b/test/TEST-27-STDOUTFILE/test.sh index f19ac4ac8c..144b88fa30 100755 --- a/test/TEST-27-STDOUTFILE/test.sh +++ b/test/TEST-27-STDOUTFILE/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test StandardOutput=file:" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 27 +do_test "$@" diff --git a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh index 5525538463..d535c41684 100755 --- a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh +++ b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh @@ -7,4 +7,4 @@ RUN_IN_UNPRIVILEGED_CONTAINER=yes # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 28 +do_test "$@" diff --git a/test/TEST-29-PORTABLE/test.sh b/test/TEST-29-PORTABLE/test.sh index 9eff1d797e..579e04dbf5 100755 --- a/test/TEST-29-PORTABLE/test.sh +++ b/test/TEST-29-PORTABLE/test.sh @@ -27,4 +27,4 @@ test_append_files() { ) } -do_test "$@" 29 +do_test "$@" diff --git a/test/TEST-30-ONCLOCKCHANGE/test.sh b/test/TEST-30-ONCLOCKCHANGE/test.sh index 6a201514dc..aefe4bb00d 100755 --- a/test/TEST-30-ONCLOCKCHANGE/test.sh +++ b/test/TEST-30-ONCLOCKCHANGE/test.sh @@ -7,4 +7,4 @@ TEST_NO_NSPAWN=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 30 +do_test "$@" diff --git a/test/TEST-31-DEVICE-ENUMERATION/test.sh b/test/TEST-31-DEVICE-ENUMERATION/test.sh index a474ec84ed..809f7fdca7 100755 --- a/test/TEST-31-DEVICE-ENUMERATION/test.sh +++ b/test/TEST-31-DEVICE-ENUMERATION/test.sh @@ -9,4 +9,4 @@ TEST_NO_NSPAWN=1 QEMU_TIMEOUT=300 -do_test "$@" 31 +do_test "$@" diff --git a/test/TEST-32-OOMPOLICY/test.sh b/test/TEST-32-OOMPOLICY/test.sh index 11290fd8e4..299bfe443a 100755 --- a/test/TEST-32-OOMPOLICY/test.sh +++ b/test/TEST-32-OOMPOLICY/test.sh @@ -9,4 +9,4 @@ TEST_NO_NSPAWN=1 UNIFIED_CGROUP_HIERARCHY=yes -do_test "$@" 32 +do_test "$@" diff --git a/test/TEST-33-CLEAN-UNIT/test.sh b/test/TEST-33-CLEAN-UNIT/test.sh index 0fcaae69e3..d49a85828c 100755 --- a/test/TEST-33-CLEAN-UNIT/test.sh +++ b/test/TEST-33-CLEAN-UNIT/test.sh @@ -8,4 +8,4 @@ TEST_DESCRIPTION="test CleanUnit" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 33 +do_test "$@" diff --git a/test/TEST-34-DYNAMICUSERMIGRATE/test.sh b/test/TEST-34-DYNAMICUSERMIGRATE/test.sh index d30113c757..4d5ca336f1 100755 --- a/test/TEST-34-DYNAMICUSERMIGRATE/test.sh +++ b/test/TEST-34-DYNAMICUSERMIGRATE/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test migrating state directory from DynamicUser=1 to DynamicUs # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 34 +do_test "$@" diff --git a/test/TEST-36-NUMAPOLICY/test.sh b/test/TEST-36-NUMAPOLICY/test.sh index 9422a16083..f1c36b3d6b 100755 --- a/test/TEST-36-NUMAPOLICY/test.sh +++ b/test/TEST-36-NUMAPOLICY/test.sh @@ -13,4 +13,4 @@ else QEMU_OPTIONS="-numa node,nodeid=0" fi -do_test "$@" 36 +do_test "$@" diff --git a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh index 72e312fca0..ebe4c4f1b5 100755 --- a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh +++ b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh @@ -8,4 +8,4 @@ TEST_DESCRIPTION="test RuntimeDirectoryPreserve=yes" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 37 +do_test "$@" diff --git a/test/TEST-38-FREEZER/test.sh b/test/TEST-38-FREEZER/test.sh index 524180b1ad..dab05022be 100755 --- a/test/TEST-38-FREEZER/test.sh +++ b/test/TEST-38-FREEZER/test.sh @@ -7,4 +7,4 @@ TEST_NO_NSPAWN=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 38 +do_test "$@" diff --git a/test/TEST-39-EXECRELOAD/test.sh b/test/TEST-39-EXECRELOAD/test.sh index 8f09ff1ac8..653aee13ab 100755 --- a/test/TEST-39-EXECRELOAD/test.sh +++ b/test/TEST-39-EXECRELOAD/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="Test ExecReload= (PR #13098)" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 39 +do_test "$@" diff --git a/test/TEST-40-EXEC-COMMAND-EX/test.sh b/test/TEST-40-EXEC-COMMAND-EX/test.sh index 4e998d31f8..bbbbad7064 100755 --- a/test/TEST-40-EXEC-COMMAND-EX/test.sh +++ b/test/TEST-40-EXEC-COMMAND-EX/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test ExecXYZEx= service unit dbus hookups" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 40 +do_test "$@" diff --git a/test/TEST-41-ONESHOT-RESTART/test.sh b/test/TEST-41-ONESHOT-RESTART/test.sh index 43ed4648c0..aced44314b 100755 --- a/test/TEST-41-ONESHOT-RESTART/test.sh +++ b/test/TEST-41-ONESHOT-RESTART/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="Test oneshot unit restart on failure" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 41 +do_test "$@" diff --git a/test/TEST-42-EXECSTOPPOST/test.sh b/test/TEST-42-EXECSTOPPOST/test.sh index 8e25dd8f18..59f8868af2 100755 --- a/test/TEST-42-EXECSTOPPOST/test.sh +++ b/test/TEST-42-EXECSTOPPOST/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test that ExecStopPost= is always run" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 42 +do_test "$@" diff --git a/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh b/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh index bdd18290e8..9a7aa401bf 100755 --- a/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh +++ b/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh @@ -8,4 +8,4 @@ TEST_DESCRIPTION="Test PrivateUsers=yes on user manager" has_user_dbus_socket || exit 0 -do_test "$@" 43 +do_test "$@" diff --git a/test/TEST-44-LOG-NAMESPACE/test.sh b/test/TEST-44-LOG-NAMESPACE/test.sh index 2562b325cb..3caa76cecf 100755 --- a/test/TEST-44-LOG-NAMESPACE/test.sh +++ b/test/TEST-44-LOG-NAMESPACE/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test log namespaces" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 44 +do_test "$@" diff --git a/test/TEST-46-HOMED/test.sh b/test/TEST-46-HOMED/test.sh index dedc660b44..dea7e43876 100755 --- a/test/TEST-46-HOMED/test.sh +++ b/test/TEST-46-HOMED/test.sh @@ -7,4 +7,4 @@ TEST_NO_QEMU=1 # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 46 +do_test "$@" diff --git a/test/TEST-47-ISSUE-14566/test.sh b/test/TEST-47-ISSUE-14566/test.sh index f9ce149865..c275770d4b 100755 --- a/test/TEST-47-ISSUE-14566/test.sh +++ b/test/TEST-47-ISSUE-14566/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="Test that KillMode=mixed does not leave left over processes wi # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 47 +do_test "$@" diff --git a/test/TEST-48-START-STOP-NO-RELOAD/test.sh b/test/TEST-48-START-STOP-NO-RELOAD/test.sh index 68d584fe77..d1abc8aeeb 100755 --- a/test/TEST-48-START-STOP-NO-RELOAD/test.sh +++ b/test/TEST-48-START-STOP-NO-RELOAD/test.sh @@ -8,4 +8,4 @@ TEST_DESCRIPTION="test StartStopNoReload" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 48 +do_test "$@" diff --git a/test/TEST-49-RUNTIME-BIND-PATHS/test.sh b/test/TEST-49-RUNTIME-BIND-PATHS/test.sh index d20dd9ca1b..297b22d4ee 100755 --- a/test/TEST-49-RUNTIME-BIND-PATHS/test.sh +++ b/test/TEST-49-RUNTIME-BIND-PATHS/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test adding new BindPaths while unit is already running" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 49 +do_test "$@" diff --git a/test/TEST-50-DISSECT/test.sh b/test/TEST-50-DISSECT/test.sh index 8765b11cb8..67f68a39ec 100755 --- a/test/TEST-50-DISSECT/test.sh +++ b/test/TEST-50-DISSECT/test.sh @@ -30,4 +30,4 @@ test_append_files() { ) } -do_test "$@" 50 +do_test "$@" diff --git a/test/TEST-51-ISSUE-16115/test.sh b/test/TEST-51-ISSUE-16115/test.sh index 11dd85e460..5a0498e066 100755 --- a/test/TEST-51-ISSUE-16115/test.sh +++ b/test/TEST-51-ISSUE-16115/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="Test ExecCondition= does not restart on abnormal or failure" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 51 +do_test "$@" diff --git a/test/TEST-53-ISSUE-16347/test.sh b/test/TEST-53-ISSUE-16347/test.sh index 492d517932..699b7b65d8 100755 --- a/test/TEST-53-ISSUE-16347/test.sh +++ b/test/TEST-53-ISSUE-16347/test.sh @@ -9,4 +9,4 @@ QEMU_OPTIONS="-rtc base=$(date -u +%Y-%m-%dT%H:%M:%S -d '+3 days')" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 53 +do_test "$@" diff --git a/test/TEST-54-CREDS/test.sh b/test/TEST-54-CREDS/test.sh index 4562c6095e..28333d38d8 100755 --- a/test/TEST-54-CREDS/test.sh +++ b/test/TEST-54-CREDS/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test credentials" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 54 +do_test "$@" diff --git a/test/TEST-56-EXIT-TYPE/test.sh b/test/TEST-56-EXIT-TYPE/test.sh index e654accb0e..0f84dca1ba 100755 --- a/test/TEST-56-EXIT-TYPE/test.sh +++ b/test/TEST-56-EXIT-TYPE/test.sh @@ -6,4 +6,4 @@ TEST_DESCRIPTION="test ExitType=cgroup" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" -do_test "$@" 56 +do_test "$@" diff --git a/test/TEST-58-REPART/test.sh b/test/TEST-58-REPART/test.sh index bb08c4fc20..3a3c33f141 100755 --- a/test/TEST-58-REPART/test.sh +++ b/test/TEST-58-REPART/test.sh @@ -4,4 +4,4 @@ TEST_DESCRIPTION="test systemd-repart" TEST_NO_NSPAWN=1 . $TEST_BASE_DIR/test-functions -do_test "$@" 58 +do_test "$@" diff --git a/test/TEST-59-RELOADING-RESTART/test.sh b/test/TEST-59-RELOADING-RESTART/test.sh index ad990963b8..9232d7816a 100755 --- a/test/TEST-59-RELOADING-RESTART/test.sh +++ b/test/TEST-59-RELOADING-RESTART/test.sh @@ -6,4 +6,4 @@ TEST_NO_QEMU=1 . $TEST_BASE_DIR/test-functions -do_test "$@" 59 +do_test "$@" diff --git a/test/test-functions b/test/test-functions index f6d1c9e0bb..16bb4fa847 100644 --- a/test/test-functions +++ b/test/test-functions @@ -57,7 +57,7 @@ fi # The calling test.sh scripts have TEST_BASE_DIR set via their Makefile, but we don't need them to provide it TEST_BASE_DIR=${TEST_BASE_DIR:-$(realpath "$(dirname "${BASH_SOURCE[0]}")")} -TEST_UNITS_DIR="$TEST_BASE_DIR/units" +TEST_UNITS_DIR="$(realpath "$TEST_BASE_DIR/units")" SOURCE_DIR=$(realpath "$TEST_BASE_DIR/..") TOOLS_DIR="$SOURCE_DIR/tools" # These variables are used by test scripts @@ -91,6 +91,17 @@ STATEFILE="$STATEDIR/.testdir" IMAGESTATEDIR="$STATEDIR/.." TESTLOG="$STATEDIR/test.log" +if ! [[ "$TESTNAME" =~ ^TEST\-([0-9]+)\-.+$ ]]; then + echo "ERROR: Test name '$TESTNAME' is not in the expected format: TEST-[0-9]+-*" >&2 + exit 1 +fi +TESTID="${BASH_REMATCH[1]:?}" + +if [[ ! -f "$TEST_UNITS_DIR/testsuite-$TESTID.service" ]]; then + echo "ERROR: Test '$TESTNAME' is missing its service file '$TEST_UNITS_DIR/testsuite-$TESTID.service" >&2 + exit 1 +fi + BASICTOOLS=( awk basename @@ -2444,7 +2455,7 @@ do_test() { case $1 in --run) echo "${testname} RUN: $TEST_DESCRIPTION" - test_run "$2" + test_run "$TESTID" ret=$? if [ $ret -eq 0 ]; then echo "${testname} RUN: $TEST_DESCRIPTION [OK]" @@ -2475,7 +2486,7 @@ do_test() { test_setup_cleanup </dev/null >>"$TESTLOG" 2>&1 || ret=$? fi if [ $ret -eq 0 ]; then - test_run "$2" </dev/null >>"$TESTLOG" 2>&1 || ret=$? + test_run "$TESTID" </dev/null >>"$TESTLOG" 2>&1 || ret=$? fi test_cleanup if [ $ret -eq 0 ]; then |