From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 2 Aug 2024 08:13:47 +0000 (+0200)
Subject: test: don't use /skipped for subtests
X-Git-Tag: v257-rc1~770
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d1fbe53c1cc9b04acd897c728d996191daa618d;p=thirdparty%2Fsystemd.git

test: don't use /skipped for subtests

Since, at least the old framework, checks for the presence of the file
at the end and marks the whole test as skipped if it exists.

Resolves: systemd/systemd-centos-ci#728
---

diff --git a/test/units/TEST-04-JOURNAL.bsod.sh b/test/units/TEST-04-JOURNAL.bsod.sh
index 83feb892be0..802d474f163 100755
--- a/test/units/TEST-04-JOURNAL.bsod.sh
+++ b/test/units/TEST-04-JOURNAL.bsod.sh
@@ -4,12 +4,12 @@ set -eux
 set -o pipefail
 
 if systemd-detect-virt -cq; then
-    echo "This test requires a VM, skipping the test" | tee --append /skipped
+    echo "This test requires a VM, skipping the test"
     exit 0
 fi
 
 if [[ ! -x /usr/lib/systemd/systemd-bsod ]]; then
-    echo "systemd-bsod is not installed, skipping the test" | tee --append /skipped
+    echo "systemd-bsod is not installed, skipping the test"
     exit 0
 fi
 
diff --git a/test/units/TEST-17-UDEV.credentials.sh b/test/units/TEST-17-UDEV.credentials.sh
index 42d3883c396..2552dc6809f 100755
--- a/test/units/TEST-17-UDEV.credentials.sh
+++ b/test/units/TEST-17-UDEV.credentials.sh
@@ -5,7 +5,7 @@ set -eux
 set -o pipefail
 
 if [[ $(systemctl is-enabled systemd-udev-load-credentials.service) == not-found ]]; then
-    echo "Missing systemd-udev-load-credentials.service" >>/skipped
+    echo "Missing systemd-udev-load-credentials.service"
     exit 0
 fi