From c346b82a53f5321cf7e97c9571143155e9b36cc9 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Fri, 14 Aug 2026 14:13:05 +0200
Subject: [PATCH 1/4] test: move wait_for_machine into util.sh

The vmspawn-based TEST-87 subtests each carried a near-identical
wait_for_machine() helper. Move it into util.sh so it can be shared.
The shared version is the vmspawn.sh variant, which tells missing
vhost-user-fs (nested VM) apart from any other early exit. As a result,
bin-volume and replace-storage now use that distinction too instead of
treating every early exit alike. vmspawn-drives is unaffected of this,
its --image-only console never matches the vhost-user-fs marker, so an
early exit still fails.

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 .../units/TEST-87-AUX-UTILS-VM.bind-volume.sh | 18 -------------
 .../TEST-87-AUX-UTILS-VM.replace-storage.sh   | 18 -------------
 .../TEST-87-AUX-UTILS-VM.vmspawn-drives.sh    | 14 -----------
 test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh    | 24 ------------------
 test/units/util.sh                            | 25 +++++++++++++++++++
 5 files changed, 25 insertions(+), 74 deletions(-)

diff --git a/test/units/TEST-87-AUX-UTILS-VM.bind-volume.sh b/test/units/TEST-87-AUX-UTILS-VM.bind-volume.sh
index 6339e39093..d9437d3325 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.bind-volume.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.bind-volume.sh
@@ -90,24 +90,6 @@ mke2fs -t ext4 -q -d "$WORKDIR/rootfs" "$WORKDIR/root.raw"
 BOOT_VOL="test-bind-volume-boot-$$"
 RUNTIME_VOL="test-bind-volume-runtime-$$"
 
-wait_for_machine() {
-    local machine="$1" pid="$2" log="$3"
-    timeout 30 bash -c "
-        while ! machinectl list --no-legend 2>/dev/null | grep >/dev/null '$machine'; do
-            if ! kill -0 $pid 2>/dev/null; then
-                echo 'vmspawn exited before machine registration'
-                cat '$log'
-                exit 77
-            fi
-            sleep .5
-        done
-    " || {
-        local rc=$?
-        if [[ $rc -eq 77 ]]; then exit 0; fi
-        exit "$rc"
-    }
-}
-
 # --- Boot the VM with one boot-time bind-volume ---
 MACHINE="test-bind-volume-$$"
 systemd-vmspawn \
diff --git a/test/units/TEST-87-AUX-UTILS-VM.replace-storage.sh b/test/units/TEST-87-AUX-UTILS-VM.replace-storage.sh
index 22ff57adf8..67c4cbacef 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.replace-storage.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.replace-storage.sh
@@ -92,24 +92,6 @@ RUNTIME_VOL="test-replace-storage-runtime-$$"
 truncate -s 32M "$WORKDIR/new-backing-1.raw"
 truncate -s 32M "$WORKDIR/new-backing-2.raw"
 
-wait_for_machine() {
-    local machine="$1" pid="$2" log="$3"
-    timeout 30 bash -c "
-        while ! machinectl list --no-legend 2>/dev/null | grep >/dev/null '$machine'; do
-            if ! kill -0 $pid 2>/dev/null; then
-                echo 'vmspawn exited before machine registration'
-                cat '$log'
-                exit 77
-            fi
-            sleep .5
-        done
-    " || {
-        local rc=$?
-        if [[ $rc -eq 77 ]]; then exit 0; fi
-        exit "$rc"
-    }
-}
-
 MACHINE="test-replace-storage-$$"
 systemd-vmspawn \
     --machine="$MACHINE" \
diff --git a/test/units/TEST-87-AUX-UTILS-VM.vmspawn-drives.sh b/test/units/TEST-87-AUX-UTILS-VM.vmspawn-drives.sh
index 31b3bf8b51..cbdba03200 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.vmspawn-drives.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.vmspawn-drives.sh
@@ -83,20 +83,6 @@ mke2fs -t ext4 -q -d "$WORKDIR/rootfs" "$WORKDIR/root.raw"
 truncate -s 64M "$WORKDIR/extra1.raw"
 truncate -s 32M "$WORKDIR/extra2.raw"
 
-wait_for_machine() {
-    local machine="$1" pid="$2" log="$3"
-    timeout 30 bash -c "
-        while ! machinectl list --no-legend 2>/dev/null | grep >/dev/null '$machine'; do
-            if ! kill -0 $pid 2>/dev/null; then
-                echo 'vmspawn exited before machine registration'
-                cat '$log'
-                exit 1
-            fi
-            sleep .5
-        done
-    "
-}
-
 # --- Test 1: Multi-drive setup (root + 2 extra drives) ---
 # Verifies that --image with multiple --extra-drive flags works with the async
 # QMP pipeline. Three drives means three fdset allocations, three blockdev-add
diff --git a/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh b/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh
index 0a33cbd60c..74071ec3af 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh
@@ -77,30 +77,6 @@ exec sleep infinity
 EOF
 chmod +x "$WORKDIR/root/sbin/init"
 
-# Wait for a vmspawn machine to register with machined.
-# Skips the test gracefully if vmspawn fails due to missing vhost-user-fs support (nested VM).
-wait_for_machine() {
-    local machine="$1" pid="$2" log="$3"
-    timeout 30 bash -c "
-        while ! machinectl list --no-legend 2>/dev/null | grep >/dev/null '$machine'; do
-            if ! kill -0 $pid 2>/dev/null; then
-                if grep >/dev/null 'virtiofs.*QMP\|vhost-user-fs-pci' '$log'; then
-                    echo 'vhost-user-fs not supported (nested VM?), skipping'
-                    exit 77
-                fi
-                echo 'vmspawn exited before registering'
-                cat '$log'
-                exit 1
-            fi
-            sleep .5
-        done
-    " || {
-        local rc=$?
-        if [[ $rc -eq 77 ]]; then exit 0; fi
-        exit "$rc"
-    }
-}
-
 # Launch vmspawn in the background with direct kernel boot and headless console.
 systemd-vmspawn \
     --machine="$MACHINE" \
diff --git a/test/units/util.sh b/test/units/util.sh
index 14bc29af11..265f180098 100755
--- a/test/units/util.sh
+++ b/test/units/util.sh
@@ -576,3 +576,28 @@ find_qemu_binary() {
 
     command -v "qemu-system-$arch" >/dev/null 2>&1
 }
+
+# Waits for a systemd-vmspawn machine to register with machined. If vmspawn bailed out because
+# vhost-user-fs isn't available (e.g. inside a nested VM) the test is skipped gracefully; any other
+# early vmspawn exit is treated as a failure. Args: machine name, vmspawn PID, vmspawn console log.
+wait_for_machine() {
+    local machine="$1" pid="$2" log="$3"
+    timeout 30 bash -c "
+        while ! machinectl list --no-legend 2>/dev/null | grep >/dev/null '$machine'; do
+            if ! kill -0 $pid 2>/dev/null; then
+                if grep >/dev/null 'virtiofs.*QMP\|vhost-user-fs-pci' '$log'; then
+                    echo 'vhost-user-fs not supported (nested VM?), skipping'
+                    exit 77
+                fi
+                echo 'vmspawn exited before registering'
+                cat '$log'
+                exit 1
+            fi
+            sleep .5
+        done
+    " || {
+        local rc=$?
+        if [[ $rc -eq 77 ]]; then exit 0; fi
+        exit "$rc"
+    }
+}

From 2966fbd39133870c1d6371ec84e902a6a18e3256 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Fri, 14 Aug 2026 11:20:57 +0200
Subject: [PATCH 2/4] test: let subtests report skips via exit 77

run_subtests() and run_subtests_with_signals() now treat a subtest exit
code of 77 as skipped rather than a failure, track skipped subtests
separately, and list them in the summary. Previously a subtest could
only fake a skip by exiting 0, which was indistinguishable from a real
pass.

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 test/units/test-control.sh | 51 +++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/test/units/test-control.sh b/test/units/test-control.sh
index 4546231d68..2c93382caf 100644
--- a/test/units/test-control.sh
+++ b/test/units/test-control.sh
@@ -8,6 +8,11 @@ fi
 
 declare -i _CHILD_PID=0
 _PASSED_TESTS=()
+_SKIPPED_TESTS=()
+
+# A subtest may exit with this code to report that it skipped itself,
+# matching the skip code used by the integration test harness.
+_SUBTEST_SKIP_RC=77
 
 # Like trap, but passes the signal name as the first argument
 _trap_with_sig() {
@@ -56,7 +61,7 @@ _wait_harder() {
 _show_summary() {(
     set +x
 
-    if [[ ${#_PASSED_TESTS[@]} -eq 0 ]]; then
+    if [[ ${#_PASSED_TESTS[@]} -eq 0 && ${#_SKIPPED_TESTS[@]} -eq 0 ]]; then
         echo >&2 "No tests were executed, this is most likely an error"
         exit 1
     fi
@@ -66,12 +71,34 @@ _show_summary() {(
     for t in "${_PASSED_TESTS[@]}"; do
         echo "$t"
     done
+
+    if [[ ${#_SKIPPED_TESTS[@]} -gt 0 ]]; then
+        printf "SKIPPED TESTS: %3d:\n" "${#_SKIPPED_TESTS[@]}"
+        echo   "-------------------"
+        for t in "${_SKIPPED_TESTS[@]}"; do
+            echo "$t"
+        done
+    fi
 )}
 
+_record_subtest_rc() {
+    local subtest="${1:?}" rc="${2:?}"
+
+    if [[ $rc -eq $_SUBTEST_SKIP_RC ]]; then
+        echo "Subtest $subtest skipped"
+        _SKIPPED_TESTS+=("$subtest")
+    elif [[ $rc -ne 0 ]]; then
+        echo "Subtest $subtest failed"
+        return 1
+    else
+        _PASSED_TESTS+=("$subtest")
+    fi
+}
+
 # Like run_subtests, but propagate specified signals to the subtest script
 run_subtests_with_signals() {
     local subtests=("${0%.sh}".*.sh)
-    local subtest
+    local subtest rc
 
     if [[ "${#subtests[@]}" -eq 0 ]]; then
         echo >&2 "No subtests found for file $0"
@@ -100,14 +127,11 @@ run_subtests_with_signals() {
 
         : "--- $subtest BEGIN ---"
         SECONDS=0
+        rc=0
         "./$subtest" &
         _CHILD_PID=$!
-        if ! _wait_harder "$_CHILD_PID"; then
-            echo "Subtest $subtest failed"
-            return 1
-        fi
-
-        _PASSED_TESTS+=("$subtest")
+        _wait_harder "$_CHILD_PID" || rc=$?
+        _record_subtest_rc "$subtest" "$rc" || return 1
         : "--- $subtest END (${SECONDS}s) ---"
     done
 
@@ -117,7 +141,7 @@ run_subtests_with_signals() {
 # Run all subtests (i.e. files named as $TESTNAME.<subtest_name>.sh)
 run_subtests() {
     local subtests=("${0%.sh}".*.sh)
-    local subtest
+    local subtest rc
 
     if [[ "${#subtests[@]}" -eq 0 ]]; then
         echo >&2 "No subtests found for file $0"
@@ -139,12 +163,9 @@ run_subtests() {
 
         : "--- $subtest BEGIN ---"
         SECONDS=0
-        if ! "./$subtest"; then
-            echo "Subtest $subtest failed"
-            return 1
-        fi
-
-        _PASSED_TESTS+=("$subtest")
+        rc=0
+        "./$subtest" || rc=$?
+        _record_subtest_rc "$subtest" "$rc" || return 1
         : "--- $subtest END (${SECONDS}s) ---"
     done
 

From f2e5962fe8283fc4464ab23cd81755e351f7c47f Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Fri, 14 Aug 2026 11:38:55 +0200
Subject: [PATCH 3/4] test: skip unrunnable subtests via exit 77

Now that run_subtests() understands 77 as skipped, make the subtests
that bail out early on a missing capability or precondition exit 77
instead of exit 0. Partial skips that run after real assertions, and
exits from inside subshells, are deliberately left untouched.

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 test/units/TEST-04-JOURNAL.LogFilterPatterns.sh  |  2 +-
 test/units/TEST-04-JOURNAL.bsod.sh               |  4 ++--
 test/units/TEST-04-JOURNAL.fss.sh                |  2 +-
 test/units/TEST-04-JOURNAL.journal-gatewayd.sh   |  2 +-
 test/units/TEST-04-JOURNAL.journal-remote.sh     |  4 ++--
 test/units/TEST-07-PID1.DeferReactivation.sh     |  2 +-
 test/units/TEST-07-PID1.mqueue-ownership.sh      |  2 +-
 test/units/TEST-07-PID1.nft.sh                   |  2 +-
 test/units/TEST-13-NSPAWN.pull-oci.sh            |  4 ++--
 test/units/TEST-13-NSPAWN.unpriv.sh              |  2 +-
 test/units/TEST-17-UDEV.hwdb.sh                  |  2 +-
 test/units/TEST-17-UDEV.netif-altname.sh         |  2 +-
 test/units/TEST-19-CGROUP.ExitType-cgroup.sh     |  2 +-
 test/units/TEST-19-CGROUP.IPAddressAllow-Deny.sh |  4 ++--
 ...19-CGROUP.abort-on-cgroup-creation-failure.sh |  2 +-
 test/units/TEST-19-CGROUP.delegate.sh            |  2 +-
 test/units/TEST-19-CGROUP.keyed-properties.sh    |  2 +-
 .../units/TEST-23-UNIT-FILE.verify-unit-files.sh |  4 ++--
 test/units/TEST-29-PORTABLE.user.sh              |  2 +-
 test/units/TEST-50-DISSECT.mountfsd.sh           |  2 +-
 test/units/TEST-70-TPM2.cryptenroll.sh           |  2 +-
 test/units/TEST-70-TPM2.cryptsetup-measure.sh    |  2 +-
 test/units/TEST-70-TPM2.measure.sh               |  2 +-
 test/units/TEST-70-TPM2.nvpcr.sh                 |  2 +-
 test/units/TEST-70-TPM2.pcrextend.sh             |  2 +-
 test/units/TEST-70-TPM2.pcrlock.sh               |  2 +-
 test/units/TEST-70-TPM2.tpm2-setup.sh            |  2 +-
 test/units/TEST-74-AUX-UTILS.firstboot.sh        |  2 +-
 test/units/TEST-74-AUX-UTILS.imds.sh             |  2 +-
 test/units/TEST-74-AUX-UTILS.keyutil.sh          |  2 +-
 test/units/TEST-74-AUX-UTILS.machine-tags.sh     |  2 +-
 test/units/TEST-74-AUX-UTILS.mute-console.sh     |  2 +-
 test/units/TEST-74-AUX-UTILS.sbsign.sh           |  4 ++--
 test/units/TEST-74-AUX-UTILS.socket-xattr.sh     |  2 +-
 test/units/TEST-74-AUX-UTILS.ssh.sh              |  2 +-
 test/units/TEST-74-AUX-UTILS.userdbctl.sh        |  2 +-
 .../TEST-74-AUX-UTILS.varlinkctl-list-sockets.sh |  2 +-
 test/units/TEST-87-AUX-UTILS-VM.bind-volume.sh   | 14 +++++++-------
 test/units/TEST-87-AUX-UTILS-VM.bootctl.sh       |  4 ++--
 .../TEST-87-AUX-UTILS-VM.replace-storage.sh      | 14 +++++++-------
 test/units/TEST-87-AUX-UTILS-VM.sysinstall.sh    | 12 ++++++------
 .../units/TEST-87-AUX-UTILS-VM.vmspawn-drives.sh | 10 +++++-----
 test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh       | 10 +++++-----
 test/units/TEST-90-RESTRICT-FSACCESS.config.sh   |  2 +-
 ...EST-90-RESTRICT-FSACCESS.dm-verity-keyring.sh | 14 +++++++-------
 test/units/TEST-90-RESTRICT-FSACCESS.enforce.sh  | 16 ++++++++--------
 test/units/util.sh                               |  6 +-----
 47 files changed, 92 insertions(+), 96 deletions(-)

diff --git a/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh b/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh
index 87c78f0af5..586f7afb82 100755
--- a/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh
+++ b/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh
@@ -8,7 +8,7 @@ set -o pipefail
 
 if ! cgroupfs_supports_user_xattrs; then
     echo "CGroup does not support user xattrs, skipping LogFilterPatterns= tests."
-    exit 0
+    exit 77
 fi
 
 # Unfortunately, journalctl -I/--invocation= is unstable when debug logging is enabled on service manager.
diff --git a/test/units/TEST-04-JOURNAL.bsod.sh b/test/units/TEST-04-JOURNAL.bsod.sh
index d4a4ff26da..619bc4cfb9 100755
--- a/test/units/TEST-04-JOURNAL.bsod.sh
+++ b/test/units/TEST-04-JOURNAL.bsod.sh
@@ -5,12 +5,12 @@ set -o pipefail
 
 if systemd-detect-virt -cq; then
     echo "This test requires a VM, skipping the test"
-    exit 0
+    exit 77
 fi
 
 if [[ ! -x /usr/lib/systemd/systemd-bsod ]]; then
     echo "systemd-bsod is not installed, skipping the test"
-    exit 0
+    exit 77
 fi
 
 # shellcheck disable=SC2317
diff --git a/test/units/TEST-04-JOURNAL.fss.sh b/test/units/TEST-04-JOURNAL.fss.sh
index b3f27195a7..e17ab2e183 100755
--- a/test/units/TEST-04-JOURNAL.fss.sh
+++ b/test/units/TEST-04-JOURNAL.fss.sh
@@ -7,7 +7,7 @@ set -o pipefail
 
 if ! journalctl --version | grep -F +OPENSSL >/dev/null; then
     echo "Built without openssl, skipping the FSS tests"
-    exit 0
+    exit 77
 fi
 
 # output key and related info in json format
diff --git a/test/units/TEST-04-JOURNAL.journal-gatewayd.sh b/test/units/TEST-04-JOURNAL.journal-gatewayd.sh
index 64af25e960..4290680df4 100755
--- a/test/units/TEST-04-JOURNAL.journal-gatewayd.sh
+++ b/test/units/TEST-04-JOURNAL.journal-gatewayd.sh
@@ -5,7 +5,7 @@ set -o pipefail
 
 if [[ ! -x /usr/lib/systemd/systemd-journal-gatewayd ]]; then
     echo "Built without systemd-journal-gatewayd support, skipping the test"
-    exit 0
+    exit 77
 fi
 
 LOG_FILE="$(mktemp)"
diff --git a/test/units/TEST-04-JOURNAL.journal-remote.sh b/test/units/TEST-04-JOURNAL.journal-remote.sh
index 14be8a1309..3772ffc380 100755
--- a/test/units/TEST-04-JOURNAL.journal-remote.sh
+++ b/test/units/TEST-04-JOURNAL.journal-remote.sh
@@ -6,12 +6,12 @@ set -o pipefail
 
 if [[ ! -x /usr/lib/systemd/systemd-journal-remote || ! -x /usr/lib/systemd/systemd-journal-upload ]]; then
     echo "Built without systemd-journal-remote/upload support, skipping the test"
-    exit 0
+    exit 77
 fi
 
 if ! command -v openssl >/dev/null; then
     echo "openssl command not available, skipping the tests"
-    exit 0
+    exit 77
 fi
 
 at_exit() {
diff --git a/test/units/TEST-07-PID1.DeferReactivation.sh b/test/units/TEST-07-PID1.DeferReactivation.sh
index 8d16ff1145..57f97be697 100755
--- a/test/units/TEST-07-PID1.DeferReactivation.sh
+++ b/test/units/TEST-07-PID1.DeferReactivation.sh
@@ -8,7 +8,7 @@ if [[ -v ASAN_OPTIONS ]]; then
     # Under sanitizers the service is slow enough that the calendar timer with 5s resolution ends up
     # missing ticks, making the test flaky
     echo "Sanitizers detected, skipping the test..."
-    exit 0
+    exit 77
 fi
 
 systemctl start defer-reactivation.timer
diff --git a/test/units/TEST-07-PID1.mqueue-ownership.sh b/test/units/TEST-07-PID1.mqueue-ownership.sh
index bdb3dfd74f..701da75136 100755
--- a/test/units/TEST-07-PID1.mqueue-ownership.sh
+++ b/test/units/TEST-07-PID1.mqueue-ownership.sh
@@ -11,7 +11,7 @@ private_ipcns=$(systemd-run --quiet --wait --pipe -p PrivateIPC=yes readlink /pr
 
 if [[ ! -d /proc/sys/fs/mqueue ]]; then
     echo "POSIX message queues are not supported, skipping ownership checks"
-    exit 0
+    exit 77
 fi
 
 # Verify ownership attributes are applied to message queues
diff --git a/test/units/TEST-07-PID1.nft.sh b/test/units/TEST-07-PID1.nft.sh
index 3713cd6c86..0ecc56bdbf 100755
--- a/test/units/TEST-07-PID1.nft.sh
+++ b/test/units/TEST-07-PID1.nft.sh
@@ -5,7 +5,7 @@ set -o pipefail
 
 if ! command -v nft >/dev/null; then
     echo "nftables is not installed. Skipped NFTSet= tests."
-    exit 0
+    exit 77
 fi
 
 RUN_OUT="$(mktemp)"
diff --git a/test/units/TEST-13-NSPAWN.pull-oci.sh b/test/units/TEST-13-NSPAWN.pull-oci.sh
index b2a6382377..75de93b72e 100755
--- a/test/units/TEST-13-NSPAWN.pull-oci.sh
+++ b/test/units/TEST-13-NSPAWN.pull-oci.sh
@@ -9,7 +9,7 @@ set -o pipefail
 
 if ! can_do_rootless_nspawn; then
     echo "Skipping unpriv nspawn test"
-    exit 0
+    exit 77
 fi
 
 # We need FSCONFIG_SET_FD support in overlayfs for .mstack to work. Let's skip
@@ -18,7 +18,7 @@ fi
 # support for this from shell, hence let's do a version check instead.
 if systemd-analyze condition 'ConditionVersion= < 6.13' ; then
     echo "Kernel too old for FSCONFIG_SET_FD support on overlayfs, skipping pull-oci test".
-    exit 0
+    exit 77
 fi
 
 export SYSTEMD_LOG_LEVEL=debug
diff --git a/test/units/TEST-13-NSPAWN.unpriv.sh b/test/units/TEST-13-NSPAWN.unpriv.sh
index f51de0018e..4cba05f1a2 100755
--- a/test/units/TEST-13-NSPAWN.unpriv.sh
+++ b/test/units/TEST-13-NSPAWN.unpriv.sh
@@ -9,7 +9,7 @@ set -o pipefail
 
 if ! can_do_rootless_nspawn; then
     echo "Skipping unpriv nspawn test"
-    exit 0
+    exit 77
 fi
 
 at_exit() {
diff --git a/test/units/TEST-17-UDEV.hwdb.sh b/test/units/TEST-17-UDEV.hwdb.sh
index c953fbdb27..73f24b5bd9 100755
--- a/test/units/TEST-17-UDEV.hwdb.sh
+++ b/test/units/TEST-17-UDEV.hwdb.sh
@@ -5,7 +5,7 @@ set -o pipefail
 
 if ! command -v systemd-hwdb >/dev/null; then
     echo "systemd-hwdb not found, skipping."
-    exit 0
+    exit 77
 fi
 
 # shellcheck source=test/units/util.sh
diff --git a/test/units/TEST-17-UDEV.netif-altname.sh b/test/units/TEST-17-UDEV.netif-altname.sh
index bb33df1376..f8812c7fce 100755
--- a/test/units/TEST-17-UDEV.netif-altname.sh
+++ b/test/units/TEST-17-UDEV.netif-altname.sh
@@ -28,7 +28,7 @@ udevadm wait --settle --timeout=30 /sys/class/net/test1
 output=$(ip link show dev test1)
 if ! [[ "$output" =~ altname ]]; then
     echo "alternative name for network interface not supported, skipping test."
-    exit 0
+    exit 77
 fi
 assert_not_in "altname test1" "$output"
 assert_in "altname test2" "$output"
diff --git a/test/units/TEST-19-CGROUP.ExitType-cgroup.sh b/test/units/TEST-19-CGROUP.ExitType-cgroup.sh
index fd861904d4..1d46c81798 100755
--- a/test/units/TEST-19-CGROUP.ExitType-cgroup.sh
+++ b/test/units/TEST-19-CGROUP.ExitType-cgroup.sh
@@ -8,7 +8,7 @@ set -eux
 
 if [[ "$(get_cgroup_hierarchy)" != unified ]]; then
     echo "Skipping $0 as we're not running with the unified cgroup hierarchy"
-    exit 0
+    exit 77
 fi
 
 # Multiple level process tree, parent process stays up
diff --git a/test/units/TEST-19-CGROUP.IPAddressAllow-Deny.sh b/test/units/TEST-19-CGROUP.IPAddressAllow-Deny.sh
index a5c47b7086..54d8dd457b 100755
--- a/test/units/TEST-19-CGROUP.IPAddressAllow-Deny.sh
+++ b/test/units/TEST-19-CGROUP.IPAddressAllow-Deny.sh
@@ -8,12 +8,12 @@ set -o pipefail
 
 if [[ "$(get_cgroup_hierarchy)" != unified ]]; then
     echo "Skipping $0 as we're not running with the unified cgroup hierarchy."
-    exit 0
+    exit 77
 fi
 
 if systemd-detect-virt --container --quiet; then
     echo "Skipping $0 as we're running on container."
-    exit 0
+    exit 77
 fi
 
 ip netns add test-ns
diff --git a/test/units/TEST-19-CGROUP.abort-on-cgroup-creation-failure.sh b/test/units/TEST-19-CGROUP.abort-on-cgroup-creation-failure.sh
index 41f8b96e25..daa1963519 100755
--- a/test/units/TEST-19-CGROUP.abort-on-cgroup-creation-failure.sh
+++ b/test/units/TEST-19-CGROUP.abort-on-cgroup-creation-failure.sh
@@ -22,7 +22,7 @@ set -o pipefail
 . /etc/os-release
 if [[ "$ID" =~ opensuse ]]; then
     echo "Skipping cgroup test with too small MemoryMax= setting on openSUSE."
-    exit 0
+    exit 77
 fi
 
 cat >/run/systemd/system/testslice.slice <<EOF
diff --git a/test/units/TEST-19-CGROUP.delegate.sh b/test/units/TEST-19-CGROUP.delegate.sh
index 986b9ac2f6..3c559df969 100755
--- a/test/units/TEST-19-CGROUP.delegate.sh
+++ b/test/units/TEST-19-CGROUP.delegate.sh
@@ -13,7 +13,7 @@ set -o pipefail
 
 if [[ "$(get_cgroup_hierarchy)" != unified ]]; then
     echo "Skipping $0 as we're not running with the unified cgroup hierarchy"
-    exit 0
+    exit 77
 fi
 
 testcase_controllers() {
diff --git a/test/units/TEST-19-CGROUP.keyed-properties.sh b/test/units/TEST-19-CGROUP.keyed-properties.sh
index cde875e1cd..04981b2f24 100755
--- a/test/units/TEST-19-CGROUP.keyed-properties.sh
+++ b/test/units/TEST-19-CGROUP.keyed-properties.sh
@@ -10,7 +10,7 @@ set -o pipefail
 
 if [[ "$(get_cgroup_hierarchy)" != unified ]]; then
     echo "Skipping $0 as we're not running with the unified cgroup hierarchy"
-    exit 0
+    exit 77
 fi
 
 testcase_iodevice_dbus () {
diff --git a/test/units/TEST-23-UNIT-FILE.verify-unit-files.sh b/test/units/TEST-23-UNIT-FILE.verify-unit-files.sh
index b94e486b7a..7538cd6884 100755
--- a/test/units/TEST-23-UNIT-FILE.verify-unit-files.sh
+++ b/test/units/TEST-23-UNIT-FILE.verify-unit-files.sh
@@ -11,12 +11,12 @@ UNIT_FILE_LIST="/usr/lib/systemd/tests/testdata/installed-unit-files.txt"
 
 if [[ ! -f "$UNIT_FILE_LIST" ]]; then
     echo "Couldn't find the list of installed units, skipping the test"
-    exit 0
+    exit 77
 fi
 
 if ! command -v systemd-analyze >/dev/null; then
     echo "Built without systemd-analyze, skipping the test"
-    exit 0
+    exit 77
 fi
 
 mapfile -t UNIT_FILES <"$UNIT_FILE_LIST"
diff --git a/test/units/TEST-29-PORTABLE.user.sh b/test/units/TEST-29-PORTABLE.user.sh
index 87488dd8a4..3a281b7f1e 100755
--- a/test/units/TEST-29-PORTABLE.user.sh
+++ b/test/units/TEST-29-PORTABLE.user.sh
@@ -18,7 +18,7 @@ if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] ||
    systemd-analyze compare-versions "$(pkcheck --version | awk '{print $3}')" lt 124 ||
    systemctl --version | grep -- "-BTF" >/dev/null; then
     echo "Skipping mountfsd/nsresourced tests"
-    exit 0
+    exit 77
 fi
 
 systemctl start systemd-mountfsd.socket systemd-nsresourced.socket
diff --git a/test/units/TEST-50-DISSECT.mountfsd.sh b/test/units/TEST-50-DISSECT.mountfsd.sh
index d25743502d..889d6d9753 100755
--- a/test/units/TEST-50-DISSECT.mountfsd.sh
+++ b/test/units/TEST-50-DISSECT.mountfsd.sh
@@ -14,7 +14,7 @@ if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] ||
    systemd-analyze compare-versions "$(uname -r)" lt 6.5 ||
    systemd-analyze compare-versions "$(pkcheck --version | awk '{print $3}')" lt 124; then
     echo "Skipping mountfsd/nsresourced tests"
-    exit 0
+    exit 77
 fi
 
 at_exit() {
diff --git a/test/units/TEST-70-TPM2.cryptenroll.sh b/test/units/TEST-70-TPM2.cryptenroll.sh
index 684ff418f1..e8a6441b61 100755
--- a/test/units/TEST-70-TPM2.cryptenroll.sh
+++ b/test/units/TEST-70-TPM2.cryptenroll.sh
@@ -20,7 +20,7 @@ trap at_exit EXIT
 # There is an external issue with libcryptsetup on ppc64 that hits 95% of Ubuntu ppc64 test runs, so skip it
 if [[ "$(uname -m)" == "ppc64le" ]]; then
     echo "Skipping systemd-cryptenroll tests on ppc64le, see https://github.com/systemd/systemd/issues/27716"
-    exit 0
+    exit 77
 fi
 
 export SYSTEMD_LOG_LEVEL=debug
diff --git a/test/units/TEST-70-TPM2.cryptsetup-measure.sh b/test/units/TEST-70-TPM2.cryptsetup-measure.sh
index 45d49dc394..05e3cc7763 100755
--- a/test/units/TEST-70-TPM2.cryptsetup-measure.sh
+++ b/test/units/TEST-70-TPM2.cryptsetup-measure.sh
@@ -17,7 +17,7 @@ export SYSTEMD_LOG_LEVEL=debug
 
 if ! command -v systemd-cryptsetup >/dev/null || ! tpm_has_pcr sha256 15; then
     echo "systemd-cryptsetup or PCR 15 (sha256) not available, skipping cryptsetup measurement test"
-    exit 0
+    exit 77
 fi
 
 IMAGE=""
diff --git a/test/units/TEST-70-TPM2.measure.sh b/test/units/TEST-70-TPM2.measure.sh
index 55d6fef156..f74087544e 100755
--- a/test/units/TEST-70-TPM2.measure.sh
+++ b/test/units/TEST-70-TPM2.measure.sh
@@ -11,7 +11,7 @@ SD_MEASURE="/usr/lib/systemd/systemd-measure"
 
 if [[ ! -x "${SD_MEASURE:?}" ]]; then
     echo "$SD_MEASURE not found, skipping the test"
-    exit 0
+    exit 77
 fi
 
 at_exit() {
diff --git a/test/units/TEST-70-TPM2.nvpcr.sh b/test/units/TEST-70-TPM2.nvpcr.sh
index 7666b4ec71..60dac06c48 100755
--- a/test/units/TEST-70-TPM2.nvpcr.sh
+++ b/test/units/TEST-70-TPM2.nvpcr.sh
@@ -13,7 +13,7 @@ SD_MEASURE="/usr/lib/systemd/systemd-measure"
 
 if [[ ! -x "${SD_PCREXTEND:?}" ]] || [[ ! -x "${SD_MEASURE:?}" ]] || ! tpm_has_pcr sha256 11; then
     echo "$SD_PCREXTEND, $SD_MEASURE or PCR sysfs files not found, skipping PCR extension tests"
-    exit 0
+    exit 77
 fi
 
 at_exit() {
diff --git a/test/units/TEST-70-TPM2.pcrextend.sh b/test/units/TEST-70-TPM2.pcrextend.sh
index ec330576b2..717d64d7f8 100755
--- a/test/units/TEST-70-TPM2.pcrextend.sh
+++ b/test/units/TEST-70-TPM2.pcrextend.sh
@@ -11,7 +11,7 @@ SD_PCREXTEND="/usr/lib/systemd/systemd-pcrextend"
 
 if [[ ! -x "${SD_PCREXTEND:?}" ]] || ! tpm_has_pcr sha256 16 || ! tpm_has_pcr sha256 15; then
     echo "$SD_PCREXTEND or PCR sysfs files not found, skipping PCR extension tests"
-    exit 0
+    exit 77
 fi
 
 at_exit() {
diff --git a/test/units/TEST-70-TPM2.pcrlock.sh b/test/units/TEST-70-TPM2.pcrlock.sh
index 25f1a2537e..084d554cc9 100755
--- a/test/units/TEST-70-TPM2.pcrlock.sh
+++ b/test/units/TEST-70-TPM2.pcrlock.sh
@@ -14,7 +14,7 @@ SD_MEASURE="/usr/lib/systemd/systemd-measure"
 
 if [[ ! -x "${SD_PCREXTEND:?}" ]] || [[ ! -x "${SD_PCRLOCK:?}" ]] || [[ ! -x "${SD_MEASURE:?}" ]] ; then
     echo "$SD_PCREXTEND or $SD_PCRLOCK or $SD_MEASURE not found, skipping pcrlock tests"
-    exit 0
+    exit 77
 fi
 
 at_exit() {
diff --git a/test/units/TEST-70-TPM2.tpm2-setup.sh b/test/units/TEST-70-TPM2.tpm2-setup.sh
index fdf24b9b41..9f26fb4de9 100755
--- a/test/units/TEST-70-TPM2.tpm2-setup.sh
+++ b/test/units/TEST-70-TPM2.tpm2-setup.sh
@@ -8,7 +8,7 @@ SD_TPM2SETUP="/usr/lib/systemd/systemd-tpm2-setup"
 
 if [[ ! -x "${SD_TPM2SETUP:?}" ]]; then
     echo "$SD_TPM2SETUP not found, skipping the test"
-    exit 0
+    exit 77
 fi
 
 # systemd-tpm2-setup returns EX_UNAVAILABLE rather than 0 when it cannot set something up but this
diff --git a/test/units/TEST-74-AUX-UTILS.firstboot.sh b/test/units/TEST-74-AUX-UTILS.firstboot.sh
index 4fbbb18efa..dc02671c38 100755
--- a/test/units/TEST-74-AUX-UTILS.firstboot.sh
+++ b/test/units/TEST-74-AUX-UTILS.firstboot.sh
@@ -8,7 +8,7 @@ set -o pipefail
 
 if ! command -v systemd-firstboot >/dev/null; then
     echo "systemd-firstboot not found, skipping the test"
-    exit 0
+    exit 77
 fi
 
 restore_etc_hostname() {
diff --git a/test/units/TEST-74-AUX-UTILS.imds.sh b/test/units/TEST-74-AUX-UTILS.imds.sh
index ccd3d04c04..5fdf4ad4ca 100755
--- a/test/units/TEST-74-AUX-UTILS.imds.sh
+++ b/test/units/TEST-74-AUX-UTILS.imds.sh
@@ -9,7 +9,7 @@ set -o pipefail
 
 if ! test -x /usr/lib/systemd/systemd-imdsd ; then
     echo "No imdsd installed, skipping test."
-    exit 0
+    exit 77
 fi
 
 at_exit() {
diff --git a/test/units/TEST-74-AUX-UTILS.keyutil.sh b/test/units/TEST-74-AUX-UTILS.keyutil.sh
index 5e36392d27..1e4c94fc52 100755
--- a/test/units/TEST-74-AUX-UTILS.keyutil.sh
+++ b/test/units/TEST-74-AUX-UTILS.keyutil.sh
@@ -11,7 +11,7 @@ set -o pipefail
 
 if ! command -v /usr/lib/systemd/systemd-keyutil >/dev/null; then
     echo "systemd-keyutil not found, skipping."
-    exit 0
+    exit 77
 fi
 
 cat >/tmp/openssl.conf <<EOF
diff --git a/test/units/TEST-74-AUX-UTILS.machine-tags.sh b/test/units/TEST-74-AUX-UTILS.machine-tags.sh
index 5bd421e489..2fd213ab7d 100755
--- a/test/units/TEST-74-AUX-UTILS.machine-tags.sh
+++ b/test/units/TEST-74-AUX-UTILS.machine-tags.sh
@@ -9,7 +9,7 @@ set -o pipefail
 
 if ! command -v hostnamectl >/dev/null; then
     echo "hostnamectl not found, skipping the test"
-    exit 0
+    exit 77
 fi
 
 at_exit() {
diff --git a/test/units/TEST-74-AUX-UTILS.mute-console.sh b/test/units/TEST-74-AUX-UTILS.mute-console.sh
index e15be1ef32..244cadcfb3 100755
--- a/test/units/TEST-74-AUX-UTILS.mute-console.sh
+++ b/test/units/TEST-74-AUX-UTILS.mute-console.sh
@@ -5,7 +5,7 @@ set -o pipefail
 
 if ! command -v systemd-mute-console >/dev/null; then
     echo "systemd-mute-console is not installed, skipping the test"
-    exit 0
+    exit 77
 fi
 
 PID="$(systemd-notify --fork -- systemd-mute-console)"
diff --git a/test/units/TEST-74-AUX-UTILS.sbsign.sh b/test/units/TEST-74-AUX-UTILS.sbsign.sh
index d7bd4a2c80..842bfb0e59 100755
--- a/test/units/TEST-74-AUX-UTILS.sbsign.sh
+++ b/test/units/TEST-74-AUX-UTILS.sbsign.sh
@@ -9,12 +9,12 @@ set -o pipefail
 
 if ! command -v /usr/lib/systemd/systemd-sbsign >/dev/null; then
     echo "systemd-sbsign not found, skipping."
-    exit 0
+    exit 77
 fi
 
 if [[ ! -d /usr/lib/systemd/boot/efi ]]; then
     echo "systemd-boot is not installed, skipping."
-    exit 0
+    exit 77
 fi
 
 cat >/tmp/openssl.conf <<EOF
diff --git a/test/units/TEST-74-AUX-UTILS.socket-xattr.sh b/test/units/TEST-74-AUX-UTILS.socket-xattr.sh
index 3832fb3f82..2bffc22c21 100755
--- a/test/units/TEST-74-AUX-UTILS.socket-xattr.sh
+++ b/test/units/TEST-74-AUX-UTILS.socket-xattr.sh
@@ -12,7 +12,7 @@ set -o pipefail
 # indicator.
 if ! socket_inode_supports_user_xattrs; then
     echo "Socket inode extended attributes unsupported on this kernel, skipping." >&2
-    exit 0
+    exit 77
 fi
 
 UNIT_SOCKET_PATH="/run/test-socket-xattr.sock"
diff --git a/test/units/TEST-74-AUX-UTILS.ssh.sh b/test/units/TEST-74-AUX-UTILS.ssh.sh
index cb2afb7580..4d036bd6d0 100755
--- a/test/units/TEST-74-AUX-UTILS.ssh.sh
+++ b/test/units/TEST-74-AUX-UTILS.ssh.sh
@@ -5,7 +5,7 @@ set -o pipefail
 
 if ! command -v ssh >/dev/null || ! command -v sshd >/dev/null ; then
     echo "ssh/sshd not found, skipping test." >&2
-    exit 0
+    exit 77
 fi
 
 systemctl -q is-active sshd-unix-local.socket
diff --git a/test/units/TEST-74-AUX-UTILS.userdbctl.sh b/test/units/TEST-74-AUX-UTILS.userdbctl.sh
index c1746903d0..92bb374ed1 100755
--- a/test/units/TEST-74-AUX-UTILS.userdbctl.sh
+++ b/test/units/TEST-74-AUX-UTILS.userdbctl.sh
@@ -5,7 +5,7 @@ set -o pipefail
 
 if ! command -v userdbctl >/dev/null; then
     echo "userdbctl is not installed, skipping the test."
-    exit 0
+    exit 77
 fi
 
 # shellcheck source=test/units/util.sh
diff --git a/test/units/TEST-74-AUX-UTILS.varlinkctl-list-sockets.sh b/test/units/TEST-74-AUX-UTILS.varlinkctl-list-sockets.sh
index 2097d00fb1..4a485dea99 100755
--- a/test/units/TEST-74-AUX-UTILS.varlinkctl-list-sockets.sh
+++ b/test/units/TEST-74-AUX-UTILS.varlinkctl-list-sockets.sh
@@ -11,7 +11,7 @@ set -o pipefail
 # unavailable, since the kernel version alone is not a reliable indicator.
 if ! socket_inode_supports_user_xattrs; then
     echo "Socket inode extended attributes unsupported on this kernel, skipping." >&2
-    exit 0
+    exit 77
 fi
 
 ENTRYPOINT_PATH="/run/test-list-sockets-entrypoint.sock"
diff --git a/test/units/TEST-87-AUX-UTILS-VM.bind-volume.sh b/test/units/TEST-87-AUX-UTILS-VM.bind-volume.sh
index d9437d3325..fed6335826 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.bind-volume.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.bind-volume.sh
@@ -17,33 +17,33 @@ set -o pipefail
 
 if [[ -v ASAN_OPTIONS ]]; then
     echo "vmspawn launches QEMU which doesn't work under ASan, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! command -v systemd-vmspawn >/dev/null 2>&1; then
     echo "systemd-vmspawn not found, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! command -v storagectl >/dev/null 2>&1; then
     echo "storagectl not found, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! find_qemu_binary; then
     echo "QEMU not found, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! command -v mke2fs >/dev/null 2>&1; then
     echo "mke2fs not found, skipping"
-    exit 0
+    exit 77
 fi
 
 # Storage providers are socket-activated; skip if the fs provider socket isn't present.
 if ! test -S /run/systemd/io.systemd.StorageProvider/fs; then
     echo "StorageProvider fs socket not found, skipping"
-    exit 0
+    exit 77
 fi
 
 # Find a kernel for direct boot
@@ -57,7 +57,7 @@ done
 
 if [[ -z "$KERNEL" ]]; then
     echo "No kernel found for direct VM boot, skipping"
-    exit 0
+    exit 77
 fi
 
 WORKDIR="$(mktemp -d /tmp/test-bind-volume.XXXXXXXXXX)"
diff --git a/test/units/TEST-87-AUX-UTILS-VM.bootctl.sh b/test/units/TEST-87-AUX-UTILS-VM.bootctl.sh
index b35ab3e695..9557066379 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.bootctl.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.bootctl.sh
@@ -5,12 +5,12 @@ set -o pipefail
 
 if ! command -v bootctl >/dev/null; then
     echo "bootctl not found, skipping."
-    exit 0
+    exit 77
 fi
 
 if [[ ! -d /usr/lib/systemd/boot/efi ]]; then
     echo "sd-boot is not installed, skipping."
-    exit 0
+    exit 77
 fi
 
 # shellcheck source=test/units/util.sh
diff --git a/test/units/TEST-87-AUX-UTILS-VM.replace-storage.sh b/test/units/TEST-87-AUX-UTILS-VM.replace-storage.sh
index 67c4cbacef..65dd6296ba 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.replace-storage.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.replace-storage.sh
@@ -18,32 +18,32 @@ set -o pipefail
 
 if [[ -v ASAN_OPTIONS ]]; then
     echo "vmspawn launches QEMU which doesn't work under ASan, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! command -v systemd-vmspawn >/dev/null 2>&1; then
     echo "systemd-vmspawn not found, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! command -v storagectl >/dev/null 2>&1; then
     echo "storagectl not found, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! find_qemu_binary; then
     echo "QEMU not found, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! command -v mke2fs >/dev/null 2>&1; then
     echo "mke2fs not found, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! test -S /run/systemd/io.systemd.StorageProvider/fs; then
     echo "StorageProvider fs socket not found, skipping"
-    exit 0
+    exit 77
 fi
 
 KERNEL=""
@@ -56,7 +56,7 @@ done
 
 if [[ -z "$KERNEL" ]]; then
     echo "No kernel found for direct VM boot, skipping"
-    exit 0
+    exit 77
 fi
 
 WORKDIR="$(mktemp -d /tmp/test-replace-storage.XXXXXXXXXX)"
diff --git a/test/units/TEST-87-AUX-UTILS-VM.sysinstall.sh b/test/units/TEST-87-AUX-UTILS-VM.sysinstall.sh
index 7c51e89ebb..51be486995 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.sysinstall.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.sysinstall.sh
@@ -5,33 +5,33 @@ set -o pipefail
 
 if ! command -v systemd-sysinstall >/dev/null; then
     echo "systemd-sysinstall not found, skipping."
-    exit 0
+    exit 77
 fi
 
 if ! command -v systemd-repart >/dev/null; then
     echo "systemd-repart not found, skipping."
-    exit 0
+    exit 77
 fi
 
 if ! command -v bootctl >/dev/null; then
     echo "bootctl not found, skipping."
-    exit 0
+    exit 77
 fi
 
 if ! command -v ukify >/dev/null; then
     echo "ukify not found, skipping."
-    exit 0
+    exit 77
 fi
 
 if [[ ! -d /usr/lib/systemd/boot/efi ]]; then
     echo "sd-boot is not installed, skipping."
-    exit 0
+    exit 77
 fi
 
 # We need a real environment to fiddle with loop devices.
 if systemd-detect-virt -cq; then
     echo "Running in a container, skipping."
-    exit 0
+    exit 77
 fi
 
 # shellcheck source=test/units/test-control.sh
diff --git a/test/units/TEST-87-AUX-UTILS-VM.vmspawn-drives.sh b/test/units/TEST-87-AUX-UTILS-VM.vmspawn-drives.sh
index cbdba03200..72b677b085 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.vmspawn-drives.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.vmspawn-drives.sh
@@ -16,22 +16,22 @@ set -o pipefail
 
 if [[ -v ASAN_OPTIONS ]]; then
     echo "vmspawn launches QEMU which doesn't work under ASan, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! command -v systemd-vmspawn >/dev/null 2>&1; then
     echo "systemd-vmspawn not found, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! find_qemu_binary; then
     echo "QEMU not found, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! command -v mke2fs >/dev/null 2>&1; then
     echo "mke2fs not found, skipping"
-    exit 0
+    exit 77
 fi
 
 # Find a kernel for direct boot
@@ -45,7 +45,7 @@ done
 
 if [[ -z "$KERNEL" ]]; then
     echo "No kernel found for direct VM boot, skipping"
-    exit 0
+    exit 77
 fi
 echo "Using kernel: $KERNEL"
 
diff --git a/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh b/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh
index 74071ec3af..b4ea60c52d 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.vmspawn.sh
@@ -9,17 +9,17 @@ set -o pipefail
 
 if [[ -v ASAN_OPTIONS ]]; then
     echo "vmspawn launches QEMU which doesn't work under ASan, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! command -v systemd-vmspawn >/dev/null 2>&1; then
     echo "systemd-vmspawn not found, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! find_qemu_binary; then
     echo "QEMU not found, skipping"
-    exit 0
+    exit 77
 fi
 
 # --directory= needs virtiofsd (on Fedora it lives in /usr/libexec, not in PATH)
@@ -27,7 +27,7 @@ if ! command -v virtiofsd >/dev/null 2>&1 &&
    ! test -x /usr/libexec/virtiofsd &&
    ! test -x /usr/lib/virtiofsd; then
     echo "virtiofsd not found, skipping"
-    exit 0
+    exit 77
 fi
 
 # Find a kernel for direct boot
@@ -41,7 +41,7 @@ done
 
 if [[ -z "$KERNEL" ]]; then
     echo "No kernel found for direct VM boot, skipping"
-    exit 0
+    exit 77
 fi
 echo "Using kernel: $KERNEL"
 
diff --git a/test/units/TEST-90-RESTRICT-FSACCESS.config.sh b/test/units/TEST-90-RESTRICT-FSACCESS.config.sh
index 81bd0ff414..40f3782f18 100755
--- a/test/units/TEST-90-RESTRICT-FSACCESS.config.sh
+++ b/test/units/TEST-90-RESTRICT-FSACCESS.config.sh
@@ -16,7 +16,7 @@ set -o pipefail
 # RestrictFileSystemAccess= requires +BPF_FRAMEWORK at compile time
 if systemctl --version | grep -F -- "-BPF_FRAMEWORK" >/dev/null; then
     echo "BPF framework not compiled in, skipping"
-    exit 0
+    exit 77
 fi
 
 HELPER=/usr/lib/systemd/tests/unit-tests/manual/test-bpf-restrict-fsaccess
diff --git a/test/units/TEST-90-RESTRICT-FSACCESS.dm-verity-keyring.sh b/test/units/TEST-90-RESTRICT-FSACCESS.dm-verity-keyring.sh
index b1c1de2583..5954512a55 100755
--- a/test/units/TEST-90-RESTRICT-FSACCESS.dm-verity-keyring.sh
+++ b/test/units/TEST-90-RESTRICT-FSACCESS.dm-verity-keyring.sh
@@ -13,24 +13,24 @@ set -o pipefail
 
 if systemctl --version | grep -F -- "-BPF_FRAMEWORK" >/dev/null; then
     echo "BPF framework not compiled in, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! kernel_supports_lsm bpf; then
     echo "BPF LSM not available in kernel, skipping"
-    exit 0
+    exit 77
 fi
 
 if command -v bpftool >/dev/null 2>&1; then
     if ! bpftool btf dump file /sys/kernel/btf/vmlinux 2>/dev/null | grep 'bpf_lsm_bdev_setintegrity' >/dev/null; then
         echo "Kernel lacks bdev_setintegrity LSM hook, skipping"
-        exit 0
+        exit 77
     fi
 fi
 
 if [[ -v ASAN_OPTIONS ]]; then
     echo "Skipping under sanitizers"
-    exit 0
+    exit 77
 fi
 
 HELPER="/usr/lib/systemd/tests/unit-tests/manual/test-bpf-restrict-fsaccess"
@@ -45,7 +45,7 @@ rc=0
 "$HELPER" check >/dev/null 2>&1 || rc=$?
 if [[ "$rc" -eq 77 ]]; then
     echo "test-bpf-restrict-fsaccess built without BPF attach support, skipping"
-    exit 0
+    exit 77
 fi
 
 if [[ ! -e /sys/module/dm_verity/parameters/require_signatures ]]; then
@@ -54,7 +54,7 @@ fi
 val="$(cat /sys/module/dm_verity/parameters/require_signatures 2>/dev/null || echo)"
 if [[ "$val" != "Y" && "$val" != "1" ]]; then
     echo "require_signatures not enabled, skipping"
-    exit 0
+    exit 77
 fi
 
 # Provision the .dm-verity keyring. Empty description lets the kernel derive
@@ -63,7 +63,7 @@ keyid=$(openssl x509 -in /usr/share/mkosi.crt -outform DER |
             keyctl padd asymmetric '' %:.dm-verity 2>/dev/null) || keyid=""
 if [[ -z "$keyid" ]]; then
     echo ".dm-verity keyring not provisionable (kernel < v7.0?), skipping"
-    exit 0
+    exit 77
 fi
 if ! keyctl restrict_keyring %:.dm-verity; then
     keyctl unlink "$keyid" %:.dm-verity 2>/dev/null || true
diff --git a/test/units/TEST-90-RESTRICT-FSACCESS.enforce.sh b/test/units/TEST-90-RESTRICT-FSACCESS.enforce.sh
index f5398f62d2..6a69ca9248 100755
--- a/test/units/TEST-90-RESTRICT-FSACCESS.enforce.sh
+++ b/test/units/TEST-90-RESTRICT-FSACCESS.enforce.sh
@@ -19,12 +19,12 @@ set -o pipefail
 # Skip if prerequisites not met
 if systemctl --version | grep -F -- "-BPF_FRAMEWORK" >/dev/null; then
     echo "BPF framework not compiled in, skipping"
-    exit 0
+    exit 77
 fi
 
 if ! kernel_supports_lsm bpf; then
     echo "BPF LSM not available in kernel, skipping"
-    exit 0
+    exit 77
 fi
 
 # Check that the kernel has the bdev_setintegrity LSM hook in BTF.
@@ -32,13 +32,13 @@ fi
 if command -v bpftool >/dev/null 2>&1; then
     if ! bpftool btf dump file /sys/kernel/btf/vmlinux 2>/dev/null | grep 'bpf_lsm_bdev_setintegrity' >/dev/null; then
         echo "Kernel lacks bdev_setintegrity LSM hook (required for RestrictFileSystemAccess=), skipping"
-        exit 0
+        exit 77
     fi
 fi
 
 if [[ -v ASAN_OPTIONS ]]; then
     echo "Skipping enforcement test under sanitizers"
-    exit 0
+    exit 77
 fi
 
 HELPER="/usr/lib/systemd/tests/unit-tests/manual/test-bpf-restrict-fsaccess"
@@ -53,7 +53,7 @@ rc=0
 "$HELPER" check >/dev/null 2>&1 || rc=$?
 if [[ "$rc" -eq 77 ]]; then
     echo "test-bpf-restrict-fsaccess built without BPF attach support, skipping"
-    exit 0
+    exit 77
 fi
 
 # require_signatures is read-only — must be set via kernel cmdline
@@ -62,12 +62,12 @@ if [[ ! -e /sys/module/dm_verity/parameters/require_signatures ]]; then
 fi
 if [[ ! -e /sys/module/dm_verity/parameters/require_signatures ]]; then
     echo "dm_verity module not available, skipping enforcement test"
-    exit 0
+    exit 77
 fi
 val="$(cat /sys/module/dm_verity/parameters/require_signatures)"
 if [[ "$val" != "Y" && "$val" != "1" ]]; then
     echo "require_signatures not enabled (need dm-verity.require_signatures=1 on cmdline), skipping"
-    exit 0
+    exit 77
 fi
 
 at_exit() {
@@ -106,7 +106,7 @@ if ! /tmp/restrict-fsaccess-baseline/true 2>/dev/null; then
     echo "WARNING: tmpfs exec blocked BEFORE BPF attach (another LSM?)" >&2
     echo "Skipping enforcement test, baseline tmpfs exec fails"
     umount /tmp/restrict-fsaccess-baseline; rm -rf /tmp/restrict-fsaccess-baseline
-    exit 0
+    exit 77
 fi
 echo "Baseline: tmpfs exec works without BPF"
 umount /tmp/restrict-fsaccess-baseline; rm -rf /tmp/restrict-fsaccess-baseline
diff --git a/test/units/util.sh b/test/units/util.sh
index 265f180098..7d9467d249 100755
--- a/test/units/util.sh
+++ b/test/units/util.sh
@@ -595,9 +595,5 @@ wait_for_machine() {
             fi
             sleep .5
         done
-    " || {
-        local rc=$?
-        if [[ $rc -eq 77 ]]; then exit 0; fi
-        exit "$rc"
-    }
+    "
 }

From d6154a4d4bd90bd6128536a775a3cd59094c7255 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Fri, 14 Aug 2026 11:46:51 +0200
Subject: [PATCH 4/4] test: run_subtests_and_exit helper

Replace the "run_subtests; touch /testok" tail with a single wrapper
invocation. Report the test itself as skipped if every subtest is
skipped.

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 test/units/TEST-04-JOURNAL.sh           |  4 +---
 test/units/TEST-05-RLIMITS.sh           |  4 +---
 test/units/TEST-13-NSPAWN.sh            |  4 +---
 test/units/TEST-17-UDEV.sh              |  4 +---
 test/units/TEST-19-CGROUP.sh            |  4 +---
 test/units/TEST-22-TMPFILES.sh          |  4 +---
 test/units/TEST-23-UNIT-FILE.sh         |  4 +---
 test/units/TEST-53-TIMER.sh             |  4 +---
 test/units/TEST-70-TPM2.sh              |  4 +---
 test/units/TEST-74-AUX-UTILS.sh         |  4 +---
 test/units/TEST-81-GENERATORS.sh        |  4 +---
 test/units/TEST-90-RESTRICT-FSACCESS.sh |  4 +---
 test/units/test-control.sh              | 25 +++++++++++++++++++++++++
 13 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/test/units/TEST-04-JOURNAL.sh b/test/units/TEST-04-JOURNAL.sh
index 9c2a033aa9..a61a765589 100755
--- a/test/units/TEST-04-JOURNAL.sh
+++ b/test/units/TEST-04-JOURNAL.sh
@@ -6,6 +6,4 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/TEST-05-RLIMITS.sh b/test/units/TEST-05-RLIMITS.sh
index 9c2a033aa9..a61a765589 100755
--- a/test/units/TEST-05-RLIMITS.sh
+++ b/test/units/TEST-05-RLIMITS.sh
@@ -6,6 +6,4 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/TEST-13-NSPAWN.sh b/test/units/TEST-13-NSPAWN.sh
index 311b64a6a0..45b105f316 100755
--- a/test/units/TEST-13-NSPAWN.sh
+++ b/test/units/TEST-13-NSPAWN.sh
@@ -18,6 +18,4 @@ fi
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/TEST-17-UDEV.sh b/test/units/TEST-17-UDEV.sh
index 14ceebac95..36b7ae3be6 100755
--- a/test/units/TEST-17-UDEV.sh
+++ b/test/units/TEST-17-UDEV.sh
@@ -8,6 +8,4 @@ set -o pipefail
 
 udevadm settle
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/TEST-19-CGROUP.sh b/test/units/TEST-19-CGROUP.sh
index 9c2a033aa9..a61a765589 100755
--- a/test/units/TEST-19-CGROUP.sh
+++ b/test/units/TEST-19-CGROUP.sh
@@ -6,6 +6,4 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/TEST-22-TMPFILES.sh b/test/units/TEST-22-TMPFILES.sh
index 85109a1ad5..0b00511baa 100755
--- a/test/units/TEST-22-TMPFILES.sh
+++ b/test/units/TEST-22-TMPFILES.sh
@@ -14,6 +14,4 @@ if systemd-detect-virt --quiet --container; then
     ln -s /dev/null /run/tmpfiles.d/selinux-policy.conf
 fi
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/TEST-23-UNIT-FILE.sh b/test/units/TEST-23-UNIT-FILE.sh
index a929c8bdaa..1a503d2bab 100755
--- a/test/units/TEST-23-UNIT-FILE.sh
+++ b/test/units/TEST-23-UNIT-FILE.sh
@@ -7,6 +7,4 @@ set -o pipefail
 . "$(dirname "$0")"/test-control.sh
 
 # Note: the signal shenanigans are necessary for the Upholds= tests
-run_subtests_with_signals SIGUSR1 SIGUSR2 SIGRTMIN+1
-
-touch /testok
+run_subtests_with_signals_and_exit SIGUSR1 SIGUSR2 SIGRTMIN+1
diff --git a/test/units/TEST-53-TIMER.sh b/test/units/TEST-53-TIMER.sh
index 9c2a033aa9..a61a765589 100755
--- a/test/units/TEST-53-TIMER.sh
+++ b/test/units/TEST-53-TIMER.sh
@@ -6,6 +6,4 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/TEST-70-TPM2.sh b/test/units/TEST-70-TPM2.sh
index 9c2a033aa9..a61a765589 100755
--- a/test/units/TEST-70-TPM2.sh
+++ b/test/units/TEST-70-TPM2.sh
@@ -6,6 +6,4 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/TEST-74-AUX-UTILS.sh b/test/units/TEST-74-AUX-UTILS.sh
index 9c2a033aa9..a61a765589 100755
--- a/test/units/TEST-74-AUX-UTILS.sh
+++ b/test/units/TEST-74-AUX-UTILS.sh
@@ -6,6 +6,4 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/TEST-81-GENERATORS.sh b/test/units/TEST-81-GENERATORS.sh
index 9c2a033aa9..a61a765589 100755
--- a/test/units/TEST-81-GENERATORS.sh
+++ b/test/units/TEST-81-GENERATORS.sh
@@ -6,6 +6,4 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/TEST-90-RESTRICT-FSACCESS.sh b/test/units/TEST-90-RESTRICT-FSACCESS.sh
index 9c2a033aa9..a61a765589 100755
--- a/test/units/TEST-90-RESTRICT-FSACCESS.sh
+++ b/test/units/TEST-90-RESTRICT-FSACCESS.sh
@@ -6,6 +6,4 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
-run_subtests
-
-touch /testok
+run_subtests_and_exit
diff --git a/test/units/test-control.sh b/test/units/test-control.sh
index 2c93382caf..1e352c44b3 100644
--- a/test/units/test-control.sh
+++ b/test/units/test-control.sh
@@ -172,6 +172,31 @@ run_subtests() {
     _show_summary
 }
 
+_finalize_subtests() {
+    if [[ ${#_PASSED_TESTS[@]} -eq 0 && ${#_SKIPPED_TESTS[@]} -gt 0 ]]; then
+        echo "All subtests skipped" | tee --append /skipped
+        exit "$_SUBTEST_SKIP_RC"
+    fi
+
+    touch /testok
+    exit 0
+}
+
+# Run all subtests and finalize the test in one shot: exit 77 (skipped) if every subtest skipped,
+# otherwise mark success (/testok) and exit. Use this ONLY for tests whose body is just subtests.
+# Do NOT use it if the parent script has meaningful test content of its own.
+run_subtests_and_exit() {
+    run_subtests
+    _finalize_subtests
+}
+
+# Like run_subtests_and_exit, but propagates the given signals to the subtests (see
+# run_subtests_with_signals).
+run_subtests_with_signals_and_exit() {
+    run_subtests_with_signals "$@"
+    _finalize_subtests
+}
+
 # Run all test cases (i.e. functions prefixed with testcase_ in the current namespace)
 run_testcases() {
     local testcase testcases