test: Generate basic testsuite services with meson

Most of these are identical, let's just generate from a meson
template.

74 files changed, 60 insertions, 493 deletions

diff --git a/test/units/TEST-07-PID1.service b/test/TEST-07-PID1/TEST-07-PID1.service
index 92302bfabb..53dd54cc45 100644
--- a/test/units/TEST-07-PID1.service
+++ b/test/TEST-07-PID1/TEST-07-PID1.service
@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=TEST-07-PID1
+Wants=basic.target multi-user.target
+After=basic.target
+Before=getty-pre.target
 
 [Service]
 Type=oneshot
diff --git a/test/TEST-07-PID1/meson.build b/test/TEST-07-PID1/meson.build
index 76ed3e7581..311860dc89 100644
--- a/test/TEST-07-PID1/meson.build
+++ b/test/TEST-07-PID1/meson.build
@@ -3,6 +3,7 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
+                'unit' : files('TEST-07-PID1.service'),
         },
 ]
 
diff --git a/test/units/TEST-16-EXTEND-TIMEOUT.service b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.service
index d5494ae931..9e4675808d 100644
--- a/test/units/TEST-16-EXTEND-TIMEOUT.service
+++ b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.service
@@ -3,6 +3,10 @@
 Description=TEST-16-EXTEND-TIMEOUT
 # Testsuite: Assess all other testsuite-*.services worked as expected
 
+Wants=basic.target multi-user.target
+After=basic.target
+Before=getty-pre.target
+
 Wants=success-all.service
 Wants=success-start.service
 Wants=success-runtime.service
diff --git a/test/TEST-16-EXTEND-TIMEOUT/meson.build b/test/TEST-16-EXTEND-TIMEOUT/meson.build
index 75cf2029f9..15986acfb4 100644
--- a/test/TEST-16-EXTEND-TIMEOUT/meson.build
+++ b/test/TEST-16-EXTEND-TIMEOUT/meson.build
@@ -3,6 +3,7 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
+                'unit' : files('TEST-16-EXTEND-TIMEOUT.service'),
         },
 ]
 
diff --git a/test/TEST-32-OOMPOLICY/meson.build b/test/TEST-32-OOMPOLICY/meson.build
index 8dec5f37e7..2b832a8f6d 100644
--- a/test/TEST-32-OOMPOLICY/meson.build
+++ b/test/TEST-32-OOMPOLICY/meson.build
@@ -3,5 +3,8 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
+                'configuration' : integration_test_template['configuration'] + {
+                        'memory-accounting' : 'yes',
+                },
         },
 ]
diff --git a/test/units/TEST-44-LOG-NAMESPACE.service b/test/TEST-44-LOG-NAMESPACE/TEST-44-LOG-NAMESPACE.service
index 6189d3afa0..1b1dd98418 100644
--- a/test/units/TEST-44-LOG-NAMESPACE.service
+++ b/test/TEST-44-LOG-NAMESPACE/TEST-44-LOG-NAMESPACE.service
@@ -1,10 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=TEST-44-LOG-NAMESPACE
+Wants=basic.target multi-user.target systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
+After=basic.target systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
 Before=getty-pre.target
-Wants=getty-pre.target
-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
diff --git a/test/TEST-44-LOG-NAMESPACE/meson.build b/test/TEST-44-LOG-NAMESPACE/meson.build
index 8dec5f37e7..555ba7befd 100644
--- a/test/TEST-44-LOG-NAMESPACE/meson.build
+++ b/test/TEST-44-LOG-NAMESPACE/meson.build
@@ -3,5 +3,6 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
+                'unit' : files('TEST-44-LOG-NAMESPACE.service'),
         },
 ]
diff --git a/test/units/TEST-69-SHUTDOWN.service b/test/TEST-69-SHUTDOWN/TEST-69-SHUTDOWN.service
index 3910369c0f..5ff2842698 100644
--- a/test/units/TEST-69-SHUTDOWN.service
+++ b/test/TEST-69-SHUTDOWN/TEST-69-SHUTDOWN.service
@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Unit]
 Description=TEST-69-SHUTDOWN
+Wants=basic.target multi-user.target
+After=basic.target
+Before=getty-pre.target
 
 [Service]
 Type=oneshot
diff --git a/test/TEST-69-SHUTDOWN/meson.build b/test/TEST-69-SHUTDOWN/meson.build
index d53dbe562c..ab4a38b13e 100644
--- a/test/TEST-69-SHUTDOWN/meson.build
+++ b/test/TEST-69-SHUTDOWN/meson.build
@@ -4,5 +4,6 @@ integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
                 'enabled' : false,
+                'unit' : files('TEST-69-SHUTDOWN.service'),
         },
 ]
diff --git a/test/TEST-79-MEMPRESS/meson.build b/test/TEST-79-MEMPRESS/meson.build
index 8dec5f37e7..2b832a8f6d 100644
--- a/test/TEST-79-MEMPRESS/meson.build
+++ b/test/TEST-79-MEMPRESS/meson.build
@@ -3,5 +3,8 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
+                'configuration' : integration_test_template['configuration'] + {
+                        'memory-accounting' : 'yes',
+                },
         },
 ]
diff --git a/test/units/TEST-82-SOFTREBOOT.service b/test/TEST-82-SOFTREBOOT/TEST-82-SOFTREBOOT.service
index a8fc4f9cc7..f3892a7777 100644
--- a/test/units/TEST-82-SOFTREBOOT.service
+++ b/test/TEST-82-SOFTREBOOT/TEST-82-SOFTREBOOT.service
@@ -2,7 +2,9 @@
 [Unit]
 Description=TEST-82-SOFTREBOOT
 DefaultDependencies=no
+Wants=basic.target multi-user.target
 After=basic.target
+Before=getty-pre.target
 
 [Service]
 Type=oneshot
diff --git a/test/TEST-82-SOFTREBOOT/meson.build b/test/TEST-82-SOFTREBOOT/meson.build
index d53dbe562c..575ada9851 100644
--- a/test/TEST-82-SOFTREBOOT/meson.build
+++ b/test/TEST-82-SOFTREBOOT/meson.build
@@ -4,5 +4,6 @@ integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
                 'enabled' : false,
+                'unit' : files('TEST-82-SOFTREBOOT.service'),
         },
 ]
diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
index c762cc7ab7..14afc0f9c5 100755
--- a/test/integration-test-wrapper.py
+++ b/test/integration-test-wrapper.py
@@ -43,6 +43,7 @@ def main():
     parser.add_argument('--meson-source-dir', required=True, type=Path)
     parser.add_argument('--meson-build-dir', required=True, type=Path)
     parser.add_argument('--name', required=True)
+    parser.add_argument('--unit', required=True)
     parser.add_argument('--storage', required=True)
     parser.add_argument('--firmware', required=True)
     parser.add_argument('--slow', action=argparse.BooleanOptionalAction)
@@ -58,13 +59,10 @@ def main():
         exit(77)
 
     name = args.name + (f"-{i}" if (i := os.getenv("MESON_TEST_ITERATION")) else "")
-    unit = f"{args.name}.service"
 
     dropin = textwrap.dedent(
         """\
         [Unit]
-        After=multi-user.target network.target
-        Requires=multi-user.target
         SuccessAction=exit
         SuccessActionExitStatus=123
 
@@ -121,7 +119,7 @@ def main():
             else []
         ),
         '--credential',
-        f"systemd.unit-dropin.{unit}={shlex.quote(dropin)}",
+        f"systemd.unit-dropin.{args.unit}={shlex.quote(dropin)}",
         '--runtime-network=none',
         '--runtime-scratch=no',
         '--append',
@@ -130,7 +128,7 @@ def main():
         ' '.join([
             'systemd.hostname=H',
             f"SYSTEMD_UNIT_PATH=/usr/lib/systemd/tests/testdata/{args.name}.units:/usr/lib/systemd/tests/testdata/units:",
-            f"systemd.unit={unit}",
+            f"systemd.unit={args.unit}",
             'systemd.mask=systemd-networkd-wait-online.service',
             *(
                 [
@@ -183,7 +181,7 @@ def main():
             ops += [f"gh run download {id} --name {artifact} -D ci/{artifact}"]
             journal_file = Path(f"ci/{artifact}/test/journal/{name}.journal")
 
-        ops += [f"journalctl --file {journal_file} --no-hostname -o short-monotonic -u {unit} -p info"]
+        ops += [f"journalctl --file {journal_file} --no-hostname -o short-monotonic -u {args.unit} -p info"]
 
         print("Test failed, relevant logs can be viewed with: \n\n"
               f"{(' && '.join(ops))}\n", file=sys.stderr)
diff --git a/test/meson.build b/test/meson.build
index 6cf431904e..fab802a66d 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -283,6 +283,10 @@ integration_test_template = {
         'firmware' : 'linux',
         'slow' : false,
         'enabled' : true,
+        'configuration' : {
+                'memory-accounting' : 'no',
+                'command' : testdata_dir / 'units/%N.sh',
+        },
 }
 testdata_subdirs = [
         'auxv',
@@ -376,6 +380,21 @@ foreach integration_test : integration_tests
                 '--firmware', integration_test['firmware'],
         ]
 
+        if 'unit' in integration_test
+                integration_test_unit = integration_test['unit']
+        else
+                integration_test_unit = configure_file(
+                        input : 'test.service.in',
+                        output : '@0@.service'.format(integration_test['name']),
+                        configuration : integration_test['configuration'],
+                )
+        endif
+
+        integration_test_args += ['--unit', fs.name(integration_test_unit)]
+        if install_tests
+                install_data(integration_test_unit, install_dir : testdata_dir / 'units')
+        endif
+
         if integration_test['slow']
                 integration_test_args += ['--slow']
         endif
diff --git a/test/test-functions b/test/test-functions
index 2168854add..e1f65e26a1 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -147,11 +147,6 @@ if ! [[ "$TESTNAME" =~ ^TEST\-([0-9]+)\-.+$ ]]; then
     exit 1
 fi
 
-if [[ ! -f "$TEST_UNITS_DIR/$TESTNAME.service" ]]; then
-    echo "ERROR: Test '$TESTNAME' is missing its service file '$TEST_UNITS_DIR/$TESTNAME.service" >&2
-    exit 1
-fi
-
 BASICTOOLS=(
     awk
     base64
diff --git a/test/test.service.in b/test/test.service.in
new file mode 100644
index 0000000000..71e3618ec3
--- /dev/null
+++ b/test/test.service.in
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+[Unit]
+Description=%N
+Wants=basic.target network.target tpm2.target multi-user.target user@4711.service
+After=basic.target network.target tpm2.target user@4711.service
+Before=getty-pre.target
+
+[Service]
+ExecStartPre=rm -f /failed /testok
+ExecStart=@command@
+Type=oneshot
+MemoryAccounting=@memory-accounting@
diff --git a/test/units/TEST-01-BASIC.service b/test/units/TEST-01-BASIC.service
deleted file mode 100644
index 9074e0968f..0000000000
--- a/test/units/TEST-01-BASIC.service
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-01-BASIC
-After=multi-user.target
-Wants=systemd-resolved.service systemd-networkd.service
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-02-UNITTESTS.service b/test/units/TEST-02-UNITTESTS.service
deleted file mode 100644
index dea2c4f501..0000000000
--- a/test/units/TEST-02-UNITTESTS.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-02-UNITTESTS
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-03-JOBS.service b/test/units/TEST-03-JOBS.service
deleted file mode 100644
index 836f9621de..0000000000
--- a/test/units/TEST-03-JOBS.service
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-04-JOURNAL.service b/test/units/TEST-04-JOURNAL.service
deleted file mode 100644
index 63a010417e..0000000000
--- a/test/units/TEST-04-JOURNAL.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-05-RLIMITS.service b/test/units/TEST-05-RLIMITS.service
deleted file mode 100644
index ab72d8fe27..0000000000
--- a/test/units/TEST-05-RLIMITS.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-06-SELINUX.service b/test/units/TEST-06-SELINUX.service
deleted file mode 100644
index c4c1d87fed..0000000000
--- a/test/units/TEST-06-SELINUX.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-06-SELINUX
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-08-INITRD.service b/test/units/TEST-08-INITRD.service
deleted file mode 100644
index 2db35cf5b0..0000000000
--- a/test/units/TEST-08-INITRD.service
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-08-INITRD
-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/TEST-09-REBOOT.service b/test/units/TEST-09-REBOOT.service
deleted file mode 100644
index 6c957ecbd1..0000000000
--- a/test/units/TEST-09-REBOOT.service
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-09-REBOOT
-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/TEST-13-NSPAWN.service b/test/units/TEST-13-NSPAWN.service
deleted file mode 100644
index 95c9a02fe1..0000000000
--- a/test/units/TEST-13-NSPAWN.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-13-NSPAWN
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-15-DROPIN.service b/test/units/TEST-15-DROPIN.service
deleted file mode 100644
index 10af93f0f7..0000000000
--- a/test/units/TEST-15-DROPIN.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-17-UDEV.service b/test/units/TEST-17-UDEV.service
deleted file mode 100644
index d218d7266f..0000000000
--- a/test/units/TEST-17-UDEV.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-17-UDEV
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-18-FAILUREACTION.service b/test/units/TEST-18-FAILUREACTION.service
deleted file mode 100644
index 16d90a12c2..0000000000
--- a/test/units/TEST-18-FAILUREACTION.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-19-CGROUP.service b/test/units/TEST-19-CGROUP.service
deleted file mode 100644
index 2094a126e1..0000000000
--- a/test/units/TEST-19-CGROUP.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-19-CGROUP
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-21-DFUZZERE.service b/test/units/TEST-21-DFUZZERE.service
deleted file mode 100644
index a5f77d07b4..0000000000
--- a/test/units/TEST-21-DFUZZERE.service
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=Fuzz our D-Bus interfaces with dfuzzer
-After=dbus.service multi-user.target
-Wants=dbus.service multi-user.target
-
-[Service]
-ExecStartPre=rm -f /failed /skipped /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-22-TMPFILES.service b/test/units/TEST-22-TMPFILES.service
deleted file mode 100644
index a5ed660c62..0000000000
--- a/test/units/TEST-22-TMPFILES.service
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-22-TMPFILES
-After=systemd-tmpfiles-setup.service
-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/TEST-23-UNIT-FILE.service b/test/units/TEST-23-UNIT-FILE.service
deleted file mode 100644
index e45435b84a..0000000000
--- a/test/units/TEST-23-UNIT-FILE.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-23-UNIT-FILE
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-24-CRYPTSETUP.service b/test/units/TEST-24-CRYPTSETUP.service
deleted file mode 100644
index e192d1ccad..0000000000
--- a/test/units/TEST-24-CRYPTSETUP.service
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-24-CRYPTSETUP
-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/TEST-25-IMPORT.service b/test/units/TEST-25-IMPORT.service
deleted file mode 100644
index 503eabbe07..0000000000
--- a/test/units/TEST-25-IMPORT.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-26-SYSTEMCTL.service b/test/units/TEST-26-SYSTEMCTL.service
deleted file mode 100644
index d8fdaffb06..0000000000
--- a/test/units/TEST-26-SYSTEMCTL.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-26-SYSTEMCTL
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-29-PORTABLE.service b/test/units/TEST-29-PORTABLE.service
deleted file mode 100644
index 035c6bf4ef..0000000000
--- a/test/units/TEST-29-PORTABLE.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-29-PORTABLE
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-30-ONCLOCKCHANGE.service b/test/units/TEST-30-ONCLOCKCHANGE.service
deleted file mode 100644
index 253f7b51d4..0000000000
--- a/test/units/TEST-30-ONCLOCKCHANGE.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-31-DEVICE-ENUMERATION.service b/test/units/TEST-31-DEVICE-ENUMERATION.service
deleted file mode 100644
index f0e78a9d01..0000000000
--- a/test/units/TEST-31-DEVICE-ENUMERATION.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-32-OOMPOLICY.service b/test/units/TEST-32-OOMPOLICY.service
deleted file mode 100644
index 50f5823d31..0000000000
--- a/test/units/TEST-32-OOMPOLICY.service
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-34-DYNAMICUSERMIGRATE.service b/test/units/TEST-34-DYNAMICUSERMIGRATE.service
deleted file mode 100644
index 6917afe448..0000000000
--- a/test/units/TEST-34-DYNAMICUSERMIGRATE.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-35-LOGIN.service b/test/units/TEST-35-LOGIN.service
deleted file mode 100644
index 0599f6104e..0000000000
--- a/test/units/TEST-35-LOGIN.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-35-LOGIN
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-36-NUMAPOLICY.service b/test/units/TEST-36-NUMAPOLICY.service
deleted file mode 100644
index 5746dc1ca8..0000000000
--- a/test/units/TEST-36-NUMAPOLICY.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-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/TEST-38-FREEZER.service b/test/units/TEST-38-FREEZER.service
deleted file mode 100644
index ac77836986..0000000000
--- a/test/units/TEST-38-FREEZER.service
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-38-FREEZER
-
-[Service]
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-43-PRIVATEUSER-UNPRIV.service b/test/units/TEST-43-PRIVATEUSER-UNPRIV.service
deleted file mode 100644
index e36afea418..0000000000
--- a/test/units/TEST-43-PRIVATEUSER-UNPRIV.service
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-43-PRIVATEUSER-UNPRIV
-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/TEST-45-TIMEDATE.service b/test/units/TEST-45-TIMEDATE.service
deleted file mode 100644
index b16ce9933f..0000000000
--- a/test/units/TEST-45-TIMEDATE.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-45-TIMEDATE
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-46-HOMED.service b/test/units/TEST-46-HOMED.service
deleted file mode 100644
index 8fe6575834..0000000000
--- a/test/units/TEST-46-HOMED.service
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-46-HOMED
-Wants=getty-pre.target
-Before=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/TEST-50-DISSECT.service b/test/units/TEST-50-DISSECT.service
deleted file mode 100644
index bcafe6e0ba..0000000000
--- a/test/units/TEST-50-DISSECT.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-50-DISSECT
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-52-HONORFIRSTSHUTDOWN.service b/test/units/TEST-52-HONORFIRSTSHUTDOWN.service
deleted file mode 100644
index 966b9b6a1b..0000000000
--- a/test/units/TEST-52-HONORFIRSTSHUTDOWN.service
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-52-HONORFIRSTSHUTDOWN
-
-[Service]
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-53-ISSUE-16347.service b/test/units/TEST-53-ISSUE-16347.service
deleted file mode 100644
index cf3adbbe61..0000000000
--- a/test/units/TEST-53-ISSUE-16347.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-53-ISSUE-16347
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-54-CREDS.service b/test/units/TEST-54-CREDS.service
deleted file mode 100644
index 94bf2b7645..0000000000
--- a/test/units/TEST-54-CREDS.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-54-CREDS
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-55-OOMD.service b/test/units/TEST-55-OOMD.service
deleted file mode 100644
index 1b6b8b818f..0000000000
--- a/test/units/TEST-55-OOMD.service
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-55-OOMD
-After=user@4711.service
-Wants=user@4711.service
-
-[Service]
-ExecStartPre=rm -f /failed /skipped /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-58-REPART.service b/test/units/TEST-58-REPART.service
deleted file mode 100644
index f843527aca..0000000000
--- a/test/units/TEST-58-REPART.service
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-58-REPART
-
-[Service]
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-59-RELOADING-RESTART.service b/test/units/TEST-59-RELOADING-RESTART.service
deleted file mode 100644
index f85cfab084..0000000000
--- a/test/units/TEST-59-RELOADING-RESTART.service
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-59-RELOADING-RESTART
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
diff --git a/test/units/TEST-60-MOUNT-RATELIMIT.service b/test/units/TEST-60-MOUNT-RATELIMIT.service
deleted file mode 100644
index 1a929e4fd9..0000000000
--- a/test/units/TEST-60-MOUNT-RATELIMIT.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-60-MOUNT-RATELIMIT
-
-[Service]
-Type=oneshot
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
diff --git a/test/units/TEST-62-RESTRICT-IFACES.service b/test/units/TEST-62-RESTRICT-IFACES.service
deleted file mode 100644
index 5c3f94d860..0000000000
--- a/test/units/TEST-62-RESTRICT-IFACES.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-62-RESTRICT-IFACES
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-63-PATH.service b/test/units/TEST-63-PATH.service
deleted file mode 100644
index 483c6a859b..0000000000
--- a/test/units/TEST-63-PATH.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-63-PATH
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-64-UDEV-STORAGE.service b/test/units/TEST-64-UDEV-STORAGE.service
deleted file mode 100644
index b7626bbf94..0000000000
--- a/test/units/TEST-64-UDEV-STORAGE.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-64-UDEV-STORAGE
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-65-ANALYZE.service b/test/units/TEST-65-ANALYZE.service
deleted file mode 100644
index 3610bafde2..0000000000
--- a/test/units/TEST-65-ANALYZE.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-65-ANALYZE
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-66-DEVICEISOLATION.service b/test/units/TEST-66-DEVICEISOLATION.service
deleted file mode 100644
index 61cd0abfb5..0000000000
--- a/test/units/TEST-66-DEVICEISOLATION.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-66-DEVICEISOLATION
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-67-INTEGRITY.service b/test/units/TEST-67-INTEGRITY.service
deleted file mode 100644
index 82f998e24c..0000000000
--- a/test/units/TEST-67-INTEGRITY.service
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-67-INTEGRITY
-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/TEST-68-PROPAGATE-EXIT-STATUS.service b/test/units/TEST-68-PROPAGATE-EXIT-STATUS.service
deleted file mode 100644
index 2d86e1fedc..0000000000
--- a/test/units/TEST-68-PROPAGATE-EXIT-STATUS.service
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-68-PROPAGATE-EXIT-STATUS
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
diff --git a/test/units/TEST-70-TPM2.service b/test/units/TEST-70-TPM2.service
deleted file mode 100644
index a9c15429d4..0000000000
--- a/test/units/TEST-70-TPM2.service
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-70-TPM2
-Wants=tpm2.target
-After=tpm2.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
diff --git a/test/units/TEST-71-HOSTNAME.service b/test/units/TEST-71-HOSTNAME.service
deleted file mode 100644
index 1718629c05..0000000000
--- a/test/units/TEST-71-HOSTNAME.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-71-HOSTNAME
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-72-SYSUPDATE.service b/test/units/TEST-72-SYSUPDATE.service
deleted file mode 100644
index 1640350578..0000000000
--- a/test/units/TEST-72-SYSUPDATE.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-72-SYSUPDATE
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-73-LOCALE.service b/test/units/TEST-73-LOCALE.service
deleted file mode 100644
index 3ebd24da18..0000000000
--- a/test/units/TEST-73-LOCALE.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-73-LOCALE
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-74-AUX-UTILS.service b/test/units/TEST-74-AUX-UTILS.service
deleted file mode 100644
index f782132a92..0000000000
--- a/test/units/TEST-74-AUX-UTILS.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-74-AUX-UTILS
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-75-RESOLVED.service b/test/units/TEST-75-RESOLVED.service
deleted file mode 100644
index 3368e04b99..0000000000
--- a/test/units/TEST-75-RESOLVED.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-75-RESOLVED
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-76-SYSCTL.service b/test/units/TEST-76-SYSCTL.service
deleted file mode 100644
index 3c8a9e867f..0000000000
--- a/test/units/TEST-76-SYSCTL.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-76-SYSCTL
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-78-SIGQUEUE.service b/test/units/TEST-78-SIGQUEUE.service
deleted file mode 100644
index 05f3effdb6..0000000000
--- a/test/units/TEST-78-SIGQUEUE.service
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-78-SIGQUEUE
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
diff --git a/test/units/TEST-79-MEMPRESS.service b/test/units/TEST-79-MEMPRESS.service
deleted file mode 100644
index f2d24df9cf..0000000000
--- a/test/units/TEST-79-MEMPRESS.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-79-MEMPRESS
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-MemoryAccounting=1
diff --git a/test/units/TEST-80-NOTIFYACCESS.service b/test/units/TEST-80-NOTIFYACCESS.service
deleted file mode 100644
index 4c7f5d5ebd..0000000000
--- a/test/units/TEST-80-NOTIFYACCESS.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-80-NOTIFYACCESS
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-81-GENERATORS.service b/test/units/TEST-81-GENERATORS.service
deleted file mode 100644
index 3b697b3cff..0000000000
--- a/test/units/TEST-81-GENERATORS.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-81-GENERATORS
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-83-BTRFS.service b/test/units/TEST-83-BTRFS.service
deleted file mode 100644
index 55ebb45730..0000000000
--- a/test/units/TEST-83-BTRFS.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-83-BTRFS
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
diff --git a/test/units/TEST-84-STORAGETM.service b/test/units/TEST-84-STORAGETM.service
deleted file mode 100644
index 2c2577019c..0000000000
--- a/test/units/TEST-84-STORAGETM.service
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-84-STORAGETM
-After=multi-user.target
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot