test: make sure to reset state before starting integration tests

diff --git a/test/test-functions b/test/test-functions
index cd1bfeb2fde008df9d1a7a6bc4c03e3c44510018..0e3c2734e2fa5f642523b5cf24ac788c521c63a7 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -1899,6 +1899,9 @@ test_setup() {
 }
 
 test_run() {
+    mount_initdir
+    rm -f "$initdir"/{testok,failed,skipped}
+
     if [ -z "$TEST_NO_QEMU" ]; then
         if run_qemu "$1"; then
             check_result_qemu || return 1

diff --git a/test/units/testsuite-01.service b/test/units/testsuite-01.service
index 8112a85c186efc3131bb538ab666fd7985f50dc7..85b9cf5a9695e7ca415760d26547754850a8cac4 100644 (file)
--- a/test/units/testsuite-01.service
+++ b/test/units/testsuite-01.service
@@ -3,5 +3,6 @@ Description=TEST-01-BASIC
 After=multi-user.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=sh -e -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; systemctl daemon-reload ; echo OK >/testok'
 Type=oneshot

diff --git a/test/units/testsuite-02.service b/test/units/testsuite-02.service
index ddb472932200602fa545cbd1e628326161b68981..701610b790b1f3f4f9f8a67d297bb50698be867b 100644 (file)
--- a/test/units/testsuite-02.service
+++ b/test/units/testsuite-02.service
@@ -3,5 +3,6 @@ Description=TEST-02-CRYPTSETUP
 After=multi-user.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=sh -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; echo OK > /testok'
 Type=oneshot

diff --git a/test/units/testsuite-03.service b/test/units/testsuite-03.service
index f487d41f8228eb18937d4f4a0380fb522990bc7a..fe18fdc7d7c3eb359d40bf8ee9c4c85ffccacefe 100644 (file)
--- a/test/units/testsuite-03.service
+++ b/test/units/testsuite-03.service
@@ -3,5 +3,6 @@ Description=TEST-03-JOBS
 After=multi-user.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-04.service b/test/units/testsuite-04.service
index 468acfa43e8666dc330fe7b15abda8b1d02993a9..3d2b4a8bc2b794038ab199f9f604853f7aa1588c 100644 (file)
--- a/test/units/testsuite-04.service
+++ b/test/units/testsuite-04.service
@@ -2,5 +2,6 @@
 Description=TEST-04-JOURNAL
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-05.service b/test/units/testsuite-05.service
index 44108d77013da941a0bdc9032cc5fb42910db9a9..66356fd16f2889fd1253717aaeee0816975d24ae 100644 (file)
--- a/test/units/testsuite-05.service
+++ b/test/units/testsuite-05.service
@@ -2,5 +2,6 @@
 Description=TEST-05-RLIMITS
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-06.service b/test/units/testsuite-06.service
index 72c0a2ca0d0a85c785a91c8f0cac56e72fc543b0..3f8dad36dc7402769c45d7d05578d5c6b34eeac3 100644 (file)
--- a/test/units/testsuite-06.service
+++ b/test/units/testsuite-06.service
@@ -5,5 +5,6 @@ Requires=load-systemd-test-module.service
 After=load-systemd-test-module.service
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-07.service b/test/units/testsuite-07.service
index 5521632a06199198d565f977ac09120a60dc8966..2506c211c2bc65ea1883b1231dc867e47c3e5e2f 100644 (file)
--- a/test/units/testsuite-07.service
+++ b/test/units/testsuite-07.service
@@ -2,5 +2,6 @@
 Description=TEST-07-ISSUE-1981
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-08.service b/test/units/testsuite-08.service
index 79fb089c704bf56ee6d1858ef475afaec4c6117e..d961dc7ae295d51300f94b97228462b5db8847f8 100644 (file)
--- a/test/units/testsuite-08.service
+++ b/test/units/testsuite-08.service
@@ -2,5 +2,6 @@
 Description=TEST-08-ISSUE-2730
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=sh -x -c 'mount -o remount,rw /dev/sda1 && echo OK >/testok; systemctl poweroff'
 Type=oneshot

diff --git a/test/units/testsuite-09.service b/test/units/testsuite-09.service
index d551501335c6bb86b90b4d2139175c8173e99d0c..fc59e808893ddf87a6674a68fd9a58599ee2b382 100644 (file)
--- a/test/units/testsuite-09.service
+++ b/test/units/testsuite-09.service
@@ -2,6 +2,7 @@
 Description=TEST-09-ISSUE-2691
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=sh -c '>/testok'
 ExecStop=sh -c 'kill -SEGV $$$$'
 Type=oneshot

diff --git a/test/units/testsuite-10.service b/test/units/testsuite-10.service
index 13756cfa512e2ac29550bb168cb2dd710428839f..24f0da35abd197430c9c1bf4b7c474eddb1b1486 100644 (file)
--- a/test/units/testsuite-10.service
+++ b/test/units/testsuite-10.service
@@ -2,5 +2,6 @@
 Description=TEST-10-ISSUE-2467
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 Type=oneshot
 ExecStart=sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test10.socket; printf x >test.file; socat -t20 OPEN:test.file UNIX-CONNECT:/run/test.ctl; >/testok'

diff --git a/test/units/testsuite-11.service b/test/units/testsuite-11.service
index 9093ae8d434461fbb502940dca472131186ef30a..1544fd68198078bcc1026670c580135e59c5b4e6 100644 (file)
--- a/test/units/testsuite-11.service
+++ b/test/units/testsuite-11.service
@@ -2,5 +2,6 @@
 Description=TEST-11-ISSUE-3166
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-12.service b/test/units/testsuite-12.service
index 77153ea2eb39d735dac568940bae3b11e15710b9..72894eff9297afac2edd3c83dc079bb8c9c79a6d 100644 (file)
--- a/test/units/testsuite-12.service
+++ b/test/units/testsuite-12.service
@@ -3,5 +3,6 @@ Description=TEST-12-ISSUE-3171
 After=multi-user.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-13.service b/test/units/testsuite-13.service
index a7441d1279962510f047a4221d04bc3335dbde91..5086793a90aa0bd1a41e746b8d1a409d41a5ba9a 100644 (file)
--- a/test/units/testsuite-13.service
+++ b/test/units/testsuite-13.service
@@ -2,5 +2,6 @@
 Description=TEST-13-NSPAWN-SMOKE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-14.service b/test/units/testsuite-14.service
index 1fc0da6409d45b3ff3a1ec3a78573992d9edac73..1606c68fb163529fbe2d562c10d475a27ef9f5ad 100644 (file)
--- a/test/units/testsuite-14.service
+++ b/test/units/testsuite-14.service
@@ -2,6 +2,7 @@
 Description=TEST-14-MACHINE-ID
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 ExecStart=/bin/sh -e -x -c 'systemctl --state=failed --no-legend --no-pager >/failed ; echo OK >/testok'
 Type=oneshot

diff --git a/test/units/testsuite-15.service b/test/units/testsuite-15.service
index 2d07bd6943885bc234d388a94451919c663b8dee..09571ed1abd08b5df1095fd123db9e7932c9568d 100644 (file)
--- a/test/units/testsuite-15.service
+++ b/test/units/testsuite-15.service
@@ -2,5 +2,6 @@
 Description=TEST-15-DROPIN
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-16.service b/test/units/testsuite-16.service
index 1ebf3d3af673113354420acc97664245ede4d82f..b44baad91a650134b8b5a825c8fdf900d55d8792 100644 (file)
--- a/test/units/testsuite-16.service
+++ b/test/units/testsuite-16.service
@@ -12,6 +12,7 @@ Wants=fail-runtime.service
 StopWhenUnneeded=yes
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 Type=simple
 TimeoutStartSec=infinity
 ExecStartPre=/usr/lib/systemd/tests/testdata/units/%N.sh

diff --git a/test/units/testsuite-17.service b/test/units/testsuite-17.service
index 2002543a339a1cb7941fa271c5e3b6f1abbe0eed..ed2017a848620a349b3b2dd5ca045af6a2abddbd 100644 (file)
--- a/test/units/testsuite-17.service
+++ b/test/units/testsuite-17.service
@@ -2,5 +2,6 @@
 Description=TEST-17-UDEV-WANTS
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-18.service b/test/units/testsuite-18.service
index 08e836671eec0463a395d691c47a9591d047d4d9..e4a945dc3ed29fa2ceaf8b045f6b4d3bf768155e 100644 (file)
--- a/test/units/testsuite-18.service
+++ b/test/units/testsuite-18.service
@@ -2,5 +2,6 @@
 Description=TEST-18-FAILUREACTION
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-19.service b/test/units/testsuite-19.service
index 13a0b612cb1f5e91ac3230a3a3c112edecdacfeb..d6ad5bededaafe695681a330eb39efb9ad75ee92 100644 (file)
--- a/test/units/testsuite-19.service
+++ b/test/units/testsuite-19.service
@@ -2,5 +2,6 @@
 Description=TEST-19-DELEGATE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-20.service b/test/units/testsuite-20.service
index 9befd81283727ece616efbcff0709fdc38517547..d31d531175676560a39f62b6e885c774bb158b23 100644 (file)
--- a/test/units/testsuite-20.service
+++ b/test/units/testsuite-20.service
@@ -4,6 +4,7 @@ Before=getty-pre.target
 Wants=getty-pre.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 NotifyAccess=all

diff --git a/test/units/testsuite-22.service b/test/units/testsuite-22.service
index 3d53cbf56ce983c849eb42772edce783e26e439f..55e3056d53cebb42ba1c086ef5aa62e8347a03fa 100644 (file)
--- a/test/units/testsuite-22.service
+++ b/test/units/testsuite-22.service
@@ -5,6 +5,7 @@ Before=getty-pre.target
 Wants=getty-pre.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 StandardOutput=tty

diff --git a/test/units/testsuite-23.service b/test/units/testsuite-23.service
index c221bd28cc91a985af7198349319006222a67b41..b3b3297af8c8b32793509afdd66f32e8da8ded04 100644 (file)
--- a/test/units/testsuite-23.service
+++ b/test/units/testsuite-23.service
@@ -2,5 +2,6 @@
 Description=TEST-23-TYPE-EXEC
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-24.service b/test/units/testsuite-24.service
index de53f03fb40f7ace598936866176ad678f160961..43d4816d4857e4449e1fd36ebc6e4fc347d1e75f 100644 (file)
--- a/test/units/testsuite-24.service
+++ b/test/units/testsuite-24.service
@@ -2,5 +2,6 @@
 Description=TEST-24-UNIT-TESTS
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-24.sh b/test/units/testsuite-24.sh
index 0e3cb154777a1b4bf218e66fb0d48cbacd1f4759..1ff1c3347b2c04c7b78591a3fd58b76bf7733151 100755 (executable)
--- a/test/units/testsuite-24.sh
+++ b/test/units/testsuite-24.sh
@@ -6,6 +6,9 @@ NPROC=$(nproc)
 MAX_QUEUE_SIZE=${NPROC:-2}
 IFS=$'\n' TEST_LIST=($(ls /usr/lib/systemd/tests/test-*))
 
+# reset state
+rm /failed-tests /skipped-tests /skipped
+
 # Check & report test results
 # Arguments:
 #   $1: test path

diff --git a/test/units/testsuite-25.service b/test/units/testsuite-25.service
index 39b43917d0aca7aec02d01be8ecc34d6e124f3c6..45d8b6945f4b7407a703e69513c47cef3fc74520 100644 (file)
--- a/test/units/testsuite-25.service
+++ b/test/units/testsuite-25.service
@@ -2,5 +2,6 @@
 Description=TEST-25-IMPORT
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-26.service b/test/units/testsuite-26.service
index ac1b2faa3f9ce42843037e64a66e7894c2d8e456..65b66835ed3c865b579e1a235bde91eff78715ab 100644 (file)
--- a/test/units/testsuite-26.service
+++ b/test/units/testsuite-26.service
@@ -2,5 +2,6 @@
 Description=TEST-26-SETENV
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-27.service b/test/units/testsuite-27.service
index a1e885108869d4c04cd3f0b72211222a27a03422..52185f0572591724936420f8d648cdda715766cc 100644 (file)
--- a/test/units/testsuite-27.service
+++ b/test/units/testsuite-27.service
@@ -2,5 +2,6 @@
 Description=TEST-27-STDOUTFILE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-28.service b/test/units/testsuite-28.service
index c4be0c631c1c9cacaedc14b54fbd320392cc2c24..6a41114493131e9439337c6a2345695bdc9aa8f5 100644 (file)
--- a/test/units/testsuite-28.service
+++ b/test/units/testsuite-28.service
@@ -5,5 +5,6 @@ Wants=specifier-j-wants.service
 After=specifier-j-wants.service
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=true
 Type=oneshot

diff --git a/test/units/testsuite-29.service b/test/units/testsuite-29.service
index 87e46bd5873f6be39cdc41cc973699e80e88189b..90c2187bd79d63c45e23eaf60c68761f59823d42 100644 (file)
--- a/test/units/testsuite-29.service
+++ b/test/units/testsuite-29.service
@@ -2,5 +2,6 @@
 Description=TEST-29-UDEV-ID_RENAMING
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-30.service b/test/units/testsuite-30.service
index c3bb25853da113abca572b3ccafedcab43069d0c..eb342f3d17e70b9484189d895343b774fcf2a940 100644 (file)
--- a/test/units/testsuite-30.service
+++ b/test/units/testsuite-30.service
@@ -2,5 +2,6 @@
 Description=TEST-30-ONCLOCKCHANGE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-31.service b/test/units/testsuite-31.service
index 26ec2cb5cda0668c4ad35ba48ab8620cadf511a8..07dfb0bb5429916288150cea45a952a9e8972531 100644 (file)
--- a/test/units/testsuite-31.service
+++ b/test/units/testsuite-31.service
@@ -2,5 +2,6 @@
 Description=TEST-31-DEVICE-ENUMERATION
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-32.service b/test/units/testsuite-32.service
index a868b46abf1b920f292d2c23f7f4b0652a98d170..aab95cb7419363c0158e8be416cd739ca169bc3c 100644 (file)
--- a/test/units/testsuite-32.service
+++ b/test/units/testsuite-32.service
@@ -2,6 +2,7 @@
 Description=TEST-32-OOMPOLICY
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 MemoryAccounting=yes

diff --git a/test/units/testsuite-33.service b/test/units/testsuite-33.service
index 8b65c8b10632c5e115f2a01fc13e5180853c15c7..b64f1e0b79e55fcc89dce962c84602631288b80e 100644 (file)
--- a/test/units/testsuite-33.service
+++ b/test/units/testsuite-33.service
@@ -2,5 +2,6 @@
 Description=TEST-33-CLEAN-UNIT
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-34.service b/test/units/testsuite-34.service
index d7051d450c7097984138a18ef69cbc1bd4e9663d..361e328221ccd035117acf8f2438f988c7a3aef5 100644 (file)
--- a/test/units/testsuite-34.service
+++ b/test/units/testsuite-34.service
@@ -2,5 +2,6 @@
 Description=TEST-34-DYNAMICUSERMIGRATE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-36.service b/test/units/testsuite-36.service
index f2dcbead69fd89157b8a954323acc1e4d56f0c8f..a681153ee455723ea64c8faf15b414df978aa000 100644 (file)
--- a/test/units/testsuite-36.service
+++ b/test/units/testsuite-36.service
@@ -2,5 +2,6 @@
 Description=TEST-36-NUMAPOLICY
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-37.service b/test/units/testsuite-37.service
index 68c805985d148675d5e3c8d32a07115e06232380..d25c6d2cf9b5e6c4c29e0afe40ae93caa9513e73 100644 (file)
--- a/test/units/testsuite-37.service
+++ b/test/units/testsuite-37.service
@@ -2,5 +2,6 @@
 Description=TEST-37-RUNTIMEDIRECTORYPRESERVE
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-39.service b/test/units/testsuite-39.service
index dbd924c6aa2765826ccab6fc8d4139563fd1c510..395fe803e7722e1b637d2eecddb629f10fd109ba 100644 (file)
--- a/test/units/testsuite-39.service
+++ b/test/units/testsuite-39.service
@@ -2,5 +2,6 @@
 Description=TEST-39-EXECRELOAD
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-40.service b/test/units/testsuite-40.service
index 51659cce5d8f9e4976b5dbd8af68512c364b71d3..38b0bd80d13f4e4fd0cacd1223e791b82f7f38e9 100644 (file)
--- a/test/units/testsuite-40.service
+++ b/test/units/testsuite-40.service
@@ -2,5 +2,6 @@
 Description=TEST-40-EXEC-COMMAND-EX
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-41.service b/test/units/testsuite-41.service
index bf0b0db6a2fa748a2c2182edd6018be0b210907a..766cb4c99af80934db07d6d4926faa4208b2af48 100644 (file)
--- a/test/units/testsuite-41.service
+++ b/test/units/testsuite-41.service
@@ -2,5 +2,6 @@
 Description=TEST-41-ONESHOT-RESTART
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-42.service b/test/units/testsuite-42.service
index d5d102fd916102c72623c5d5e310fcecd51bd5c3..a5504b515d7ee2aa98b3a007dafddff905058e4a 100644 (file)
--- a/test/units/testsuite-42.service
+++ b/test/units/testsuite-42.service
@@ -4,5 +4,6 @@ Before=getty-pre.target
 Wants=getty-pre.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-43.service b/test/units/testsuite-43.service
index 6badedcc7194322ec04b401bdd266dc0530308d9..31248f17e8acadeb68502642dc3003fa0b91e720 100644 (file)
--- a/test/units/testsuite-43.service
+++ b/test/units/testsuite-43.service
@@ -4,5 +4,6 @@ After=systemd-logind.service user@4711.service
 Wants=user@4711.service
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot

diff --git a/test/units/testsuite-44.service b/test/units/testsuite-44.service
index 1211ea3eab016ff6aa74fbd63369e4fc46c76f4f..bd4dd728aa633c699dc46416b60ae13b6cee2ca6 100644 (file)
--- a/test/units/testsuite-44.service
+++ b/test/units/testsuite-44.service
@@ -6,6 +6,7 @@ Wants=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
 After=systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 LogTarget=foobar

diff --git a/test/units/testsuite-46.service b/test/units/testsuite-46.service
index 46e9a618e2cdf0e1b71d2783a0ec3e64a6962bac..da359cbb23a0c9948154b13cf2fe29ac89bd1b28 100644 (file)
--- a/test/units/testsuite-46.service
+++ b/test/units/testsuite-46.service
@@ -4,6 +4,7 @@ Before=getty-pre.target
 Wants=getty-pre.target
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
 NotifyAccess=all

diff --git a/test/units/testsuite-47.service b/test/units/testsuite-47.service
index b6015e27ccefb8ae7c71326602c63bfd7146bf42..3816c57eed61b646b2f6eccc26d614aacc1d706b 100644 (file)
--- a/test/units/testsuite-47.service
+++ b/test/units/testsuite-47.service
@@ -2,5 +2,6 @@
 Description=TEST-47-ISSUE-14566
 
 [Service]
+ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot