Merge pull request #31408 from mrc0mmand/verify-unit-files-v2

test: verify our own units (where applicable)

meson.build

@@ -2695,6 +2695,14 @@ if not meson.is_cross_build()
                 command : [export_dbus_interfaces_py, '@OUTPUT@', dbus_programs])
 endif
 
+meson_extract_unit_files = find_program('tools/meson-extract-unit-files.py')
+custom_target('installed-unit-files.txt',
+              output : 'installed-unit-files.txt',
+              capture : true,
+              install : want_tests != 'no' and install_tests,
+              install_dir : testdata_dir,
+              command : [meson_extract_unit_files, project_build_root])
+
 #####################################################################
 
 alt_time_epoch = run_command('date', '-Is', '-u', '-d', '@@0@'.format(time_epoch),

test/units/test-control.sh

@@ -86,6 +86,11 @@ run_subtests_with_signals() {
     _trap_with_sig _handle_signal "$@"
 
     for subtest in "${subtests[@]}"; do
+        if [[ -n "${TEST_MATCH_SUBTEST:-}" ]] && ! [[ "$subtest" =~ $TEST_MATCH_SUBTEST ]]; then
+            echo "Skipping $subtest (not matching '$TEST_MATCH_SUBTEST')"
+            continue
+        fi
+
         : "--- $subtest BEGIN ---"
         SECONDS=0
         "./$subtest" &

test/units/testsuite-23.verify-unit-files.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# shellcheck disable=SC2016
+set -eux
+set -o pipefail
+
+# Verify our own unit files (where applicable)
+
+# This is generated by meson during build
+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
+fi
+
+if ! command -v systemd-analyze >/dev/null; then
+    echo "Built without systemd-analyze, skipping the test"
+    exit 0
+fi
+
+mapfile -t UNIT_FILES <"$UNIT_FILE_LIST"
+
+if [[ "${#UNIT_FILES[@]}" -le 0 ]]; then
+    echo >&2 "The unit file list is empty, this is most likely a bug"
+    exit 1
+fi
+
+for unit_file in "${UNIT_FILES[@]}"; do
+    # Skip the check for a couple of units, namely:
+    #   - syslog.socket: the corresponding syslog.service might not be installed
+    #   - rc-local.service: compat API, /etc/rc.d/rc.local most likely won't be present
+    if [[ "$unit_file" =~ /(syslog.socket|rc-local.service)$ ]]; then
+        continue
+    fi
+
+    # Skip missing unit files - this is useful for $NO_BUILD runs, where certain unit files might be dropped
+    # in distro packaging
+    if [[ ! -e "$unit_file" ]]; then
+        echo "$unit_file not found, skipping"
+        continue
+    fi
+
+    systemd-analyze --recursive-errors=no --man=no verify "$unit_file"
+done

test/units/util.sh

@@ -232,7 +232,7 @@ maybe_mount_usr_overlay() {
     if [[ ! -w /usr ]]; then
         mkdir -p /tmp/usr-overlay/{upperdir,workdir}
         mount -t overlay -o lowerdir=/usr,upperdir=/tmp/usr-overlay/upperdir,workdir=/tmp/usr-overlay/workdir overlay /usr
-	MOUNTED_USR_OVERLAY=true
+        MOUNTED_USR_OVERLAY=true
     fi
 }
 

tools/meson-extract-unit-files.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+import json
+import re
+import subprocess
+import sys
+
+def main():
+    build_dir = sys.argv[1]
+
+    out = subprocess.run(["meson", "introspect", "--installed", build_dir],
+                         stdout=subprocess.PIPE, check=True)
+    files = json.loads(out.stdout)
+    for file in sorted(files.values()):
+        if re.search("^/usr/lib/systemd/(system|user)/", file) and not file.endswith(".conf"):
+            print(file)
+
+if __name__ == "__main__":
+    main()