test: unify /testok & /failed handling

And drop it where not necessary.

diff --git a/test/units/testsuite-01.sh b/test/units/testsuite-01.sh
index 20744ac9163070b5ce262c472103ce47ee6ac9e1..780f37ee128116028248e1c7be3d6f00aa018772 100755 (executable)
--- a/test/units/testsuite-01.sh
+++ b/test/units/testsuite-01.sh
@@ -45,4 +45,4 @@ systemctl daemon-reload
 # of systemd-analyze blame. See issue #27187.
 systemd-analyze blame
 
-echo OK >/testok
+touch /testok

diff --git a/test/units/testsuite-02.sh b/test/units/testsuite-02.sh
index 88e9d72ad1c60b81674797acc08a63938849a518..210bfcbad2fd5021acf0d65887c7d95d3339de5b 100755 (executable)
--- a/test/units/testsuite-02.sh
+++ b/test/units/testsuite-02.sh
@@ -113,3 +113,4 @@ set -x
 journalctl --sync
 
 test ! -s /failed
+touch /testok

diff --git a/test/units/testsuite-04.sh b/test/units/testsuite-04.sh
index 87ae518abd5715db3fd75bc9fcd58d3f680f4188..adcbf8be19fa7e73c32fe9d17a1cc5c77d755df1 100755 (executable)
--- a/test/units/testsuite-04.sh
+++ b/test/units/testsuite-04.sh
@@ -9,9 +9,6 @@ trap "journalctl --rotate --vacuum-size=16M" EXIT
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 run_subtests
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-07.sh b/test/units/testsuite-07.sh
index 58d278e1f1f26e07bbba2694fd53d1c99d7f4df9..2ee1457753abea20f81391a07a54e3c37f1ca3b1 100755 (executable)
--- a/test/units/testsuite-07.sh
+++ b/test/units/testsuite-07.sh
@@ -6,8 +6,6 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 # Issue: https://github.com/systemd/systemd/issues/2730
 # See TEST-07-PID1/test.sh for the first "half" of the test
 mountpoint /issue2730
@@ -15,4 +13,3 @@ mountpoint /issue2730
 run_subtests
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-13.sh b/test/units/testsuite-13.sh
index 5a07e7b78c272b42fe2a322dc024425882bff668..9c2a033aa98d17ce1517bf42cf30c31c187ab0ea 100755 (executable)
--- a/test/units/testsuite-13.sh
+++ b/test/units/testsuite-13.sh
@@ -6,9 +6,6 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 run_subtests
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-16.sh b/test/units/testsuite-16.sh
index ed018223192af0f7490a7f1e24257593c0ce19db..c60995a975176bf6e1dc9362970d365b655c9942 100755 (executable)
--- a/test/units/testsuite-16.sh
+++ b/test/units/testsuite-16.sh
@@ -117,4 +117,3 @@ if [[ -f "$TESTLOG" ]]; then
 fi
 
 touch /testok
-exit 0

diff --git a/test/units/testsuite-17.sh b/test/units/testsuite-17.sh
index 72040f69d87f7c4e28be2fc3045369efc35c8d75..14ceebac95c673ffc7f91097251d7435382f6544 100755 (executable)
--- a/test/units/testsuite-17.sh
+++ b/test/units/testsuite-17.sh
@@ -6,11 +6,8 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 udevadm settle
 
 run_subtests
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-19.sh b/test/units/testsuite-19.sh
index 34fe819c5e8c2c21e82c6b1b7f0ceabcb62a5ec5..9c2a033aa98d17ce1517bf42cf30c31c187ab0ea 100755 (executable)
--- a/test/units/testsuite-19.sh
+++ b/test/units/testsuite-19.sh
@@ -3,12 +3,9 @@
 set -eux
 set -o pipefail
 
-: >/failed
-
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
 run_subtests
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-21.sh b/test/units/testsuite-21.sh
index 87a18fe5404f5cda123cd365c57ed4c5916cb76d..02673ab29e15a8924cfcd620fddc04a21af2885a 100755 (executable)
--- a/test/units/testsuite-21.sh
+++ b/test/units/testsuite-21.sh
@@ -107,6 +107,4 @@ for bus in "${SESSION_BUS_LIST[@]}"; do
     systemctl --machine 'testuser@.host' --user daemon-reexec
 done
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-22.sh b/test/units/testsuite-22.sh
index 5a07e7b78c272b42fe2a322dc024425882bff668..9c2a033aa98d17ce1517bf42cf30c31c187ab0ea 100755 (executable)
--- a/test/units/testsuite-22.sh
+++ b/test/units/testsuite-22.sh
@@ -6,9 +6,6 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 run_subtests
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-23.sh b/test/units/testsuite-23.sh
index 3be645e20ae319fc619568e87b7c26b2c2a97ff5..a929c8bdaad6a484bc467fb874bf9b95db190ac1 100755 (executable)
--- a/test/units/testsuite-23.sh
+++ b/test/units/testsuite-23.sh
@@ -3,8 +3,6 @@
 set -eux
 set -o pipefail
 
-: >/failed
-
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
@@ -12,4 +10,3 @@ set -o pipefail
 run_subtests_with_signals SIGUSR1 SIGUSR2 SIGRTMIN+1
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-24.sh b/test/units/testsuite-24.sh
index 391dcf999d2fc74d36928a0a2207f456fe3ddd5f..c815f908d11417ea850f3dc575bfec6a4f60cb4e 100755 (executable)
--- a/test/units/testsuite-24.sh
+++ b/test/units/testsuite-24.sh
@@ -213,4 +213,4 @@ cryptsetup_start_and_check -f detached_fail{0..4}
 cryptsetup_start_and_check detached_slot{0..1}
 cryptsetup_start_and_check -f detached_slot_fail
 
-echo OK >/testok
+touch /testok

diff --git a/test/units/testsuite-25.sh b/test/units/testsuite-25.sh
index 860dc5bfdc70ab87c68352f4dd5ada8ab4c64cb1..b298c506e126184b0c2c7da18416ce465a2ec7e6 100755 (executable)
--- a/test/units/testsuite-25.sh
+++ b/test/units/testsuite-25.sh
@@ -140,6 +140,4 @@ machinectl remove scratch5
 test ! -f /var/lib/machines/scratch5
 (! machinectl image-status scratch5)
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-26.sh b/test/units/testsuite-26.sh
index 45d044be667ce0a4f8555e9cfdf52b612f74040c..cce2a393db705b6e5a7aae05ede3e8e228e1e77a 100755 (executable)
--- a/test/units/testsuite-26.sh
+++ b/test/units/testsuite-26.sh
@@ -7,8 +7,6 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-: >/failed
-
 at_exit() {
     if [[ -v UNIT_NAME && -e "/usr/lib/systemd/system/$UNIT_NAME" ]]; then
         rm -fvr "/usr/lib/systemd/system/$UNIT_NAME" "/etc/systemd/system/$UNIT_NAME.d" "+4"
@@ -463,4 +461,3 @@ systemctl enable --now test-WantedBy.service || :
 systemctl daemon-reload
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-29.sh b/test/units/testsuite-29.sh
index 86a13b10ba8748b78cddb3cc9424645555d3cee0..cc4ddd7c990ec53988e1b57cb2b8c149ac6558bb 100755 (executable)
--- a/test/units/testsuite-29.sh
+++ b/test/units/testsuite-29.sh
@@ -231,6 +231,4 @@ touch /tmp/emptyext/usr/lib/extension-release.d/extension-release.emptyext
 res="$(! portablectl attach --extension /tmp/emptyext /tmp/emptyroot 2> >(grep "Remote peer disconnected"))"
 test -z "${res}"
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-30.sh b/test/units/testsuite-30.sh
index 57f46669f9e72850cffaf96158d248bef7544836..104c87bfbba8fa69504c071187a51c438bae0cb2 100755 (executable)
--- a/test/units/testsuite-30.sh
+++ b/test/units/testsuite-30.sh
@@ -26,6 +26,4 @@ while test ! -f /tmp/clock-changed ; do sleep .5 ; done
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-31.sh b/test/units/testsuite-31.sh
index 024ad3652fb88e42710cf8d3efe5c577c1549405..03aba36ab83957962eeb9eacca584af42fe2b10b 100755 (executable)
--- a/test/units/testsuite-31.sh
+++ b/test/units/testsuite-31.sh
@@ -7,5 +7,4 @@ if journalctl -b -t systemd --grep '\.device: Changed plugged -> dead'; then
     exit 1
 fi
 
-echo OK >/testok
-exit 0
+touch /testok

diff --git a/test/units/testsuite-32.sh b/test/units/testsuite-32.sh
index 5c289d0abfbe9d401f62c9123fee214c70f29acd..83b548a60215471d22c836932ec5aaff3bc43df5 100755 (executable)
--- a/test/units/testsuite-32.sh
+++ b/test/units/testsuite-32.sh
@@ -33,6 +33,4 @@ if test -f /sys/fs/cgroup/system.slice/testsuite-32.service/memory.oom.group; th
     systemd-analyze log-level info
 fi
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-34.sh b/test/units/testsuite-34.sh
index 0bc3adc9b40d9f61a2ea302404959bfb33712603..d15b675e2650cf366a0752ef1ac204d87b63bf85 100755 (executable)
--- a/test/units/testsuite-34.sh
+++ b/test/units/testsuite-34.sh
@@ -157,6 +157,4 @@ test_check_writable
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-35.sh b/test/units/testsuite-35.sh
index 2dd1a560c43e97b72e773ca351eae76ca92a9688..f784575c993bb9c8c62574d04a1d56e207a53794 100755 (executable)
--- a/test/units/testsuite-35.sh
+++ b/test/units/testsuite-35.sh
@@ -653,11 +653,8 @@ EOF
     rm -f "$SCRIPT" "$PAMSERVICE"
 }
 
-: >/failed
-
 setup_test_user
 test_enable_debug
 run_testcases
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-36.sh b/test/units/testsuite-36.sh
index d242749b61e373c1d6a86f441e7910f606b4f7b2..334afaabe7daf4f6c9ed666a833f1fbe8cd16649 100755 (executable)
--- a/test/units/testsuite-36.sh
+++ b/test/units/testsuite-36.sh
@@ -349,6 +349,4 @@ systemctl daemon-reload
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-38.sh b/test/units/testsuite-38.sh
index 735cadb59ee8076572a0349edd6ce35c57e5727f..5fc87fca7b0a1b2206e7b262cd21a6d3a49ed3fc 100755 (executable)
--- a/test/units/testsuite-38.sh
+++ b/test/units/testsuite-38.sh
@@ -298,5 +298,4 @@ if [[ -e /sys/fs/cgroup/system.slice/cgroup.freeze ]]; then
     run_testcases
 fi
 
-echo OK >/testok
-exit 0
+touch /testok

diff --git a/test/units/testsuite-43.sh b/test/units/testsuite-43.sh
index f9819f2c05636a24a5155430a4d2d1113b10588d..07e6fc9b6236a504d6fc5088513c634bc200b90c 100755 (executable)
--- a/test/units/testsuite-43.sh
+++ b/test/units/testsuite-43.sh
@@ -135,6 +135,4 @@ fi
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-44.sh b/test/units/testsuite-44.sh
index da779a6901c97de92e41a0b2f59ee6a754eaba2d..fbd4ae692c0c4df6288dadea1f952d1987cc8471 100755 (executable)
--- a/test/units/testsuite-44.sh
+++ b/test/units/testsuite-44.sh
@@ -15,6 +15,4 @@ grep "^hello world$" /tmp/hello-world
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-45.sh b/test/units/testsuite-45.sh
index d5a0448ad57ab70c6637f7998582706bf4004ef8..c54b18b8005efbe07d358f83c598becea06dc6e9 100755 (executable)
--- a/test/units/testsuite-45.sh
+++ b/test/units/testsuite-45.sh
@@ -277,9 +277,6 @@ EOF
     assert_rc 3 systemctl is-active --quiet systemd-timesyncd
 }
 
-: >/failed
-
 run_testcases
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-46.sh b/test/units/testsuite-46.sh
index ec80b7147f990c9d49df12cdc7572f059ba0055f..f2a9c83cc3def930ae64ca8a2a13a7fa0688a862 100755 (executable)
--- a/test/units/testsuite-46.sh
+++ b/test/units/testsuite-46.sh
@@ -308,6 +308,4 @@ done
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh
index 52d11b9cb98f2aa89c192092a4b139ea497ccb58..fc73f01cc2ddbc3090fce20ab53e51356af09281 100755 (executable)
--- a/test/units/testsuite-50.sh
+++ b/test/units/testsuite-50.sh
@@ -551,6 +551,4 @@ echo abc > abc
 systemd-dissect --copy-to /tmp/img abc /abc
 test -f /tmp/img/abc
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-52.sh b/test/units/testsuite-52.sh
index d78fdd53bac9d8cb32f67a5111f79640cbab9d0b..16ff507d0d2974a9b62a48161ff4421cf3b8383e 100755 (executable)
--- a/test/units/testsuite-52.sh
+++ b/test/units/testsuite-52.sh
@@ -8,6 +8,4 @@ systemd-analyze log-level debug
 systemctl enable test-honor-first-shutdown.service
 systemctl start test-honor-first-shutdown.service
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-54.sh b/test/units/testsuite-54.sh
index 6c4e0065009bae139ab516e177de3de2952d4cc3..3686e0ef137ba434c92b1a06afdefec4f29b9da9 100755 (executable)
--- a/test/units/testsuite-54.sh
+++ b/test/units/testsuite-54.sh
@@ -316,6 +316,4 @@ fi
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-55.sh b/test/units/testsuite-55.sh
index 838ba3a6a051a8d20bb9cabb8ec5fcb69b96f2e4..c6258dead63a16c0c84fafa6355f84c1074302cc 100755 (executable)
--- a/test/units/testsuite-55.sh
+++ b/test/units/testsuite-55.sh
@@ -174,6 +174,4 @@ fi
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh
index c7510dd3fcafa6ef70a597e8b3db1371b9c403f4..13e40bd82ab9aa6290c73d16b4dfc65f2c9f48e3 100755 (executable)
--- a/test/units/testsuite-58.sh
+++ b/test/units/testsuite-58.sh
@@ -1183,6 +1183,4 @@ test_sector 1024
 test_sector 2048
 test_sector 4096
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-59.sh b/test/units/testsuite-59.sh
index c343ad04ea24b8ec72f6de3fb8289c021923ceef..1b622b3d8edfc1428f842318cddcd5ae56f27fb5 100755 (executable)
--- a/test/units/testsuite-59.sh
+++ b/test/units/testsuite-59.sh
@@ -157,6 +157,4 @@ rm /run/notify-reload-test.sh
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-60.sh b/test/units/testsuite-60.sh
index f51d3fdef95e764c5751e8c233cf43cbca754dce..875cdb8ff3d0be469e1c1c4d6ba8625e2f2ff7d0 100755 (executable)
--- a/test/units/testsuite-60.sh
+++ b/test/units/testsuite-60.sh
@@ -241,8 +241,6 @@ EOF
     done
 }
 
-: >/failed
-
 systemd-analyze log-level debug
 systemd-analyze log-target journal
 
@@ -308,4 +306,3 @@ test_issue_23796
 systemd-analyze log-level info
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-62.sh b/test/units/testsuite-62.sh
index 8ba01f54d7b330ff685c598a89a12da9d40eb445..ed408218fabf94b842fc38ab610a778a4b857d07 100755 (executable)
--- a/test/units/testsuite-62.sh
+++ b/test/units/testsuite-62.sh
@@ -60,6 +60,4 @@ systemctl start --wait testsuite-62-3.service
 systemctl start --wait testsuite-62-4.service
 systemctl start --wait testsuite-62-5.service
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-63.sh b/test/units/testsuite-63.sh
index 0be1f86d9cfeffa9d725e8a9f52357c5e17586c3..dd08f4e90eda7cebead5c2ad45204c47bf24b97d 100755 (executable)
--- a/test/units/testsuite-63.sh
+++ b/test/units/testsuite-63.sh
@@ -82,4 +82,4 @@ assert_in "test63-issue-24577-dep.service" "$output"
 
 systemctl log-level info
 
-echo OK >/testok
+touch /testok

diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh
index 789f24f98d1ed02faf6adc5b4178339913a266f6..0100f58c440871e6d1e4e25500d3da6167cda293 100755 (executable)
--- a/test/units/testsuite-64.sh
+++ b/test/units/testsuite-64.sh
@@ -1159,8 +1159,6 @@ testcase_mdadm_lvm() {
     helper_check_device_units
 }
 
-: >/failed
-
 udevadm settle
 udevadm control --log-level debug
 lsblk -a
@@ -1187,4 +1185,3 @@ udevadm control --log-level info
 systemctl status systemd-udevd
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-65.sh b/test/units/testsuite-65.sh
index 4c8c4146edbad0e44c54bf4986e9756be1a09164..7183a4e172160069e21cc6db914caa80fb2dbc9b 100755 (executable)
--- a/test/units/testsuite-65.sh
+++ b/test/units/testsuite-65.sh
@@ -845,6 +845,4 @@ systemd-analyze pcrs 14 7 0 ima
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-66.sh b/test/units/testsuite-66.sh
index 7a88e5bcba04de7d51b50dbaebc93b98e49297f6..147335a7af143b0d7985531ecbc6400276af7996 100755 (executable)
--- a/test/units/testsuite-66.sh
+++ b/test/units/testsuite-66.sh
@@ -21,6 +21,4 @@ grep -q "thisshouldnotbehere" "$RESULTS_FILE" && exit 42
 
 systemd-analyze log-level info
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-67.sh b/test/units/testsuite-67.sh
index c45a8bd8b36cd3e491c689751fa7f9c647037e69..ca1cbe479f3bb95b59e2dd6699b55d3df5cba421 100755 (executable)
--- a/test/units/testsuite-67.sh
+++ b/test/units/testsuite-67.sh
@@ -116,4 +116,4 @@ do
     separate_data=0
 done
 
-echo OK >/testok
+touch /testok

diff --git a/test/units/testsuite-68.sh b/test/units/testsuite-68.sh
index b9fad3597b016a3f2c9715ff58e99d4b0449695c..11da48aba01e74474102c3c49b11c43f91a8704d 100755 (executable)
--- a/test/units/testsuite-68.sh
+++ b/test/units/testsuite-68.sh
@@ -212,6 +212,5 @@ systemctl start testservice-failure-68-template.service
 wait_on_state_or_fail "testservice-failure-exit-handler-68-template@testservice-failure-68-template.service.service" "inactive" "10"
 
 systemd-analyze log-level info
-echo OK >/testok
 
-exit 0
+touch /testok

diff --git a/test/units/testsuite-70.sh b/test/units/testsuite-70.sh
index 4eb223668982afc48ce4abab859abe5ed869cd81..e88547a735fef28b16143c3f407a505c5f2e0ae0 100755 (executable)
--- a/test/units/testsuite-70.sh
+++ b/test/units/testsuite-70.sh
@@ -316,6 +316,4 @@ systemd-cryptenroll --tpm2-pcrs=boot-loader-code+boot-loader-config "$img"
 (! systemd-cryptenroll --wipe-slot=10240000 "$img")
 (! systemd-cryptenroll --fido2-device=auto --unlock-fido2-device=auto "$img")
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-71.sh b/test/units/testsuite-71.sh
index da0df0ce1f9cc724cef064efb133a85e957d37ea..da765a9d97cb7c6c3d67bc340edcd1fa4ae054cc 100755 (executable)
--- a/test/units/testsuite-71.sh
+++ b/test/units/testsuite-71.sh
@@ -223,9 +223,6 @@ testcase_nss-myhostname() {
     (! getent hosts -s myhostname fd00:dead:beef:cafe::1)
 }
 
-: >/failed
-
 run_testcases
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-72.sh b/test/units/testsuite-72.sh
index 63d1988a8499bb168240edaf9bab7fd7dae3997c..36c9712a0950f63f73e55d53671ebc29f682e28a 100755 (executable)
--- a/test/units/testsuite-72.sh
+++ b/test/units/testsuite-72.sh
@@ -202,6 +202,4 @@ verify_version v4 2048 4096
 rm  /var/tmp/72-joined.raw
 rm -r /var/tmp/72-{dirs,defs,source,xbootldr,esp}
 
-echo OK >/testok
-
-exit 0
+touch /testok

diff --git a/test/units/testsuite-73.sh b/test/units/testsuite-73.sh
index 022a70862f0c1b4bbc9b38bc372d9179080a7ae0..df5af4ba87352d551902e31a175583c2326e5982 100755 (executable)
--- a/test/units/testsuite-73.sh
+++ b/test/units/testsuite-73.sh
@@ -682,8 +682,6 @@ testcase_locale_gen_leading_space() {
     localectl set-locale en_US.UTF-8
 }
 
-: >/failed
-
 # Make sure the content of kbd-model-map is the one that the tests expect
 # regardless of the version installed on the distro where the testsuite is
 # running on.
@@ -693,4 +691,3 @@ enable_debug
 run_testcases
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-74.sh b/test/units/testsuite-74.sh
index 5a07e7b78c272b42fe2a322dc024425882bff668..9c2a033aa98d17ce1517bf42cf30c31c187ab0ea 100755 (executable)
--- a/test/units/testsuite-74.sh
+++ b/test/units/testsuite-74.sh
@@ -6,9 +6,6 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 run_subtests
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-75.sh b/test/units/testsuite-75.sh
index c9d4ca16d87f00a05473606138b026c49f4a2beb..ef0e42a81d597265bbdd40d1482035f9d4ef584a 100755 (executable)
--- a/test/units/testsuite-75.sh
+++ b/test/units/testsuite-75.sh
@@ -14,8 +14,6 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-: >/failed
-
 RUN_OUT="$(mktemp)"
 
 run() {
@@ -580,4 +578,3 @@ else
 fi
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-78.sh b/test/units/testsuite-78.sh
index 0c50847549825074313eb6ed2e004ddc3595bf73..46afd3c4316669dec3ab119080217401a80f3557 100755 (executable)
--- a/test/units/testsuite-78.sh
+++ b/test/units/testsuite-78.sh
@@ -31,6 +31,5 @@ test "$(grep SigQ: /proc/"$P"/status | cut -d: -f2 | cut -d/ -f1)" -eq 6
 systemctl stop $UNIT
 
 systemd-analyze log-level info
-echo OK >/testok
 
-exit 0
+touch /testok

diff --git a/test/units/testsuite-79.sh b/test/units/testsuite-79.sh
index 53606e117b3debd294989e37d76d803e81b5f819..205f7f3da327818ea65848515d0f4dd8f0e41a82 100755 (executable)
--- a/test/units/testsuite-79.sh
+++ b/test/units/testsuite-79.sh
@@ -54,6 +54,5 @@ systemd-run -u "$UNIT" -p Type=exec -p ProtectControlGroups=1 -p DynamicUser=1 -
 rm "$SCRIPT"
 
 systemd-analyze log-level info
-echo OK >/testok
 
-exit 0
+touch /testok

diff --git a/test/units/testsuite-80.sh b/test/units/testsuite-80.sh
index 592af9a1322dc135876b9e39f6c461aa685982cf..faadb555b10f4184a11aa468ec1bb34ec15a8054 100755 (executable)
--- a/test/units/testsuite-80.sh
+++ b/test/units/testsuite-80.sh
@@ -7,8 +7,6 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-: >/failed
-
 mkfifo /tmp/syncfifo1 /tmp/syncfifo2
 
 sync_in() {
@@ -126,6 +124,3 @@ assert_eq "$(systemctl show fdstore-pin.service -P SubState)" dead
 assert_eq "$(systemctl show fdstore-nopin.service -P SubState)" dead
 
 touch /testok
-rm /failed
-
-exit 0

diff --git a/test/units/testsuite-81.sh b/test/units/testsuite-81.sh
index 5a07e7b78c272b42fe2a322dc024425882bff668..9c2a033aa98d17ce1517bf42cf30c31c187ab0ea 100755 (executable)
--- a/test/units/testsuite-81.sh
+++ b/test/units/testsuite-81.sh
@@ -6,9 +6,6 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-: >/failed
-
 run_subtests
 
 touch /testok
-rm /failed

diff --git a/test/units/testsuite-82.sh b/test/units/testsuite-82.sh
index 24945ba56589587c1a1ad2eba0338de4a4f970e3..a078d97e75c4ea45f701077d3409627561f12d56 100755 (executable)
--- a/test/units/testsuite-82.sh
+++ b/test/units/testsuite-82.sh
@@ -140,8 +140,6 @@ EOF
 fi
 
 systemd-analyze log-level info
-echo OK >/testok
 
+touch /testok
 systemctl --no-block poweroff
-
-exit 0