test: move test units to their own directories

This also add test cases for verifying loopy.service and friends,
which was added by e66047ff62c971eefa32b42373420d61e3f2a9c1 but never
used in integration tests.

diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 2a39d344ee1a138c152f2b762e2aa6e4800c0c00..3dcb5fde8307eacc94549e444a3aa9bf7e6e049a 100644 (file)
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -32,7 +32,7 @@ TEST_RET(cgroup_mask, .sd_booted = true) {
 
         /* Prepare the manager. */
         _cleanup_free_ char *unit_dir = NULL;
-        ASSERT_OK(get_testdata_dir("units", &unit_dir));
+        ASSERT_OK(get_testdata_dir("test-cgroup-mask", &unit_dir));
         ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
         r = manager_new(RUNTIME_SCOPE_USER, MANAGER_TEST_RUN_BASIC, &m);

diff --git a/src/test/test-cgroup-unit-default.c b/src/test/test-cgroup-unit-default.c
index 2e53b0e1c8dd07f612a3b69c3caeb3346be8b017..a84152413411b9bcb497c80c1232ff604445d3ad 100644 (file)
--- a/src/test/test-cgroup-unit-default.c
+++ b/src/test/test-cgroup-unit-default.c
@@ -21,7 +21,7 @@ TEST_RET(default_memory_low, .sd_booted = true) {
                 return log_tests_skipped("cgroupfs not available");
 
         _cleanup_free_ char *unit_dir = NULL;
-        ASSERT_OK(get_testdata_dir("units", &unit_dir));
+        ASSERT_OK(get_testdata_dir("test-cgroup-unit-default", &unit_dir));
         ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
         r = manager_new(RUNTIME_SCOPE_USER, MANAGER_TEST_RUN_BASIC, &m);

diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 56b7920d8d7214a336fd169cab56d4da4bc16412..06a1d9e6fd49a41fb85fb34e9a102dcdf94faff6 100644 (file)
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -89,7 +89,7 @@ int main(int argc, char *argv[]) {
 
         /* prepare the test */
         _cleanup_free_ char *unit_dir = NULL;
-        ASSERT_OK(get_testdata_dir("units", &unit_dir));
+        ASSERT_OK(get_testdata_dir("test-engine", &unit_dir));
         ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
 

diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index ca0d75d132b57185dfd0ee425a20da5b0b68225f..1dfa91d10a43b748e45deaebfa6a96f8cbf7f16d 100644 (file)
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -25,7 +25,7 @@ int main(int argc, char *argv[]) {
 
         /* prepare the test */
         _cleanup_free_ char *unit_dir = NULL;
-        ASSERT_OK(get_testdata_dir("units", &unit_dir));
+        ASSERT_OK(get_testdata_dir("test-sched-prio", &unit_dir));
         ASSERT_OK(setenv_unit_path(unit_dir));
         assert_se(runtime_dir = setup_fake_runtime_dir());
 

diff --git a/test/units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh
similarity index 89%
rename from test/units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh
rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh
index 8b182955b5cd475e1722a78c405d51c031f76cd1..2b3a6d368fb057153c656d29a6b88e797e141853 100755 (executable)
--- a/test/units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh
+++ b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh
@@ -4,7 +4,7 @@ set -eux
 set -o pipefail
 
 # shellcheck source=test/units/util.sh
-. "$(dirname "$0")"/util.sh
+. "$(dirname "$0")"/../units/util.sh
 
 assert_eq "$LISTEN_FDS" "$1"
 assert_eq "$LISTEN_FDNAMES" "$2"

diff --git a/test/units/TEST-23-UNIT-FILE-openfile-child.sh b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-child.sh
similarity index 89%
rename from test/units/TEST-23-UNIT-FILE-openfile-child.sh
rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-child.sh
index 4828b9dc10da5dd0df5c34cea138d1c39fc5e013..9ed6509affe9dd76701466848f2d274901621135 100755 (executable)
--- a/test/units/TEST-23-UNIT-FILE-openfile-child.sh
+++ b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-child.sh
@@ -4,7 +4,7 @@ set -eux
 set -o pipefail
 
 # shellcheck source=test/units/util.sh
-. "$(dirname "$0")"/util.sh
+. "$(dirname "$0")"/../units/util.sh
 
 assert_eq "$LISTEN_FDS" "$1"
 assert_eq "$LISTEN_FDNAMES" "$2"

diff --git a/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service
index ac9583f9169038c8c19ecfabdc1606aaa8455464..973d5799df8014138627f1decd1e2fa583caf3dc 100644 (file)
--- a/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service
+++ b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service
@@ -8,4 +8,4 @@ StartLimitBurst=15
 StartLimitIntervalSec=1h
 
 [Service]
-ExecStart=/usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-short-lived.sh
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.sh

diff --git a/test/units/TEST-23-UNIT-FILE-short-lived.sh b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.sh
similarity index 100%
rename from test/units/TEST-23-UNIT-FILE-short-lived.sh
rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.sh

diff --git a/test/units/success-failure-test-failure.service b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test-failure.service
similarity index 100%
rename from test/units/success-failure-test-failure.service
rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test-failure.service

diff --git a/test/units/success-failure-test-success.service b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test-success.service
similarity index 100%
rename from test/units/success-failure-test-success.service
rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test-success.service

diff --git a/test/units/success-failure-test.service b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test.service
similarity index 100%
rename from test/units/success-failure-test.service
rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test.service

diff --git a/test/units/TEST-38-FREEZER-sleep.service b/test/integration-tests/TEST-38-FREEZER/TEST-38-FREEZER.units/TEST-38-FREEZER-sleep.service
similarity index 100%
rename from test/units/TEST-38-FREEZER-sleep.service
rename to test/integration-tests/TEST-38-FREEZER/TEST-38-FREEZER.units/TEST-38-FREEZER-sleep.service

diff --git a/test/units/TEST-55-OOMD-testbloat.service b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testbloat.service
similarity index 100%
rename from test/units/TEST-55-OOMD-testbloat.service
rename to test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testbloat.service

diff --git a/test/units/TEST-55-OOMD-testchill.service b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testchill.service
similarity index 100%
rename from test/units/TEST-55-OOMD-testchill.service
rename to test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testchill.service

diff --git a/test/units/TEST-55-OOMD-testmunch.service b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testmunch.service
similarity index 100%
rename from test/units/TEST-55-OOMD-testmunch.service
rename to test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testmunch.service

diff --git a/test/units/TEST-55-OOMD-workload.slice b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-workload.slice
similarity index 100%
rename from test/units/TEST-55-OOMD-workload.slice
rename to test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-workload.slice

diff --git a/test/units/TEST-55-OOMD-workload.slice.d/99-oom.conf b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-workload.slice.d/99-oom.conf
similarity index 100%
rename from test/units/TEST-55-OOMD-workload.slice.d/99-oom.conf
rename to test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-workload.slice.d/99-oom.conf

diff --git a/test/units/TEST-62-RESTRICT-IFACES-1.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-1.service
similarity index 100%
rename from test/units/TEST-62-RESTRICT-IFACES-1.service
rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-1.service

diff --git a/test/units/TEST-62-RESTRICT-IFACES-2.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-2.service
similarity index 100%
rename from test/units/TEST-62-RESTRICT-IFACES-2.service
rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-2.service

diff --git a/test/units/TEST-62-RESTRICT-IFACES-3.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-3.service
similarity index 100%
rename from test/units/TEST-62-RESTRICT-IFACES-3.service
rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-3.service

diff --git a/test/units/TEST-62-RESTRICT-IFACES-4.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-4.service
similarity index 100%
rename from test/units/TEST-62-RESTRICT-IFACES-4.service
rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-4.service

diff --git a/test/units/TEST-62-RESTRICT-IFACES-5.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-5.service
similarity index 100%
rename from test/units/TEST-62-RESTRICT-IFACES-5.service
rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-5.service

diff --git a/test/units/TEST-62-RESTRICT-IFACES-6.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-6.service
similarity index 100%
rename from test/units/TEST-62-RESTRICT-IFACES-6.service
rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-6.service

diff --git a/test/units/loopy.service b/test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy.service
similarity index 100%
rename from test/units/loopy.service
rename to test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy.service

diff --git a/test/units/loopy.service.d/compat.conf b/test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy.service.d/compat.conf
similarity index 100%
rename from test/units/loopy.service.d/compat.conf
rename to test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy.service.d/compat.conf

diff --git a/test/units/loopy2.service b/test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy2.service
similarity index 100%
rename from test/units/loopy2.service
rename to test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy2.service

diff --git a/test/units/loopy3.service b/test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy3.service
similarity index 100%
rename from test/units/loopy3.service
rename to test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy3.service

diff --git a/test/units/loopy4.service b/test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy4.service
similarity index 100%
rename from test/units/loopy4.service
rename to test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy4.service

diff --git a/test/units/TEST-66-DEVICE-ISOLATION-device-isolation.service b/test/integration-tests/TEST-66-DEVICE-ISOLATION/TEST-66-DEVICE-ISOLATION.units/TEST-66-DEVICE-ISOLATION-device-isolation.service
similarity index 100%
rename from test/units/TEST-66-DEVICE-ISOLATION-device-isolation.service
rename to test/integration-tests/TEST-66-DEVICE-ISOLATION/TEST-66-DEVICE-ISOLATION.units/TEST-66-DEVICE-ISOLATION-device-isolation.service

diff --git a/test/meson.build b/test/meson.build
index 7b760dc57242f4e4534ea152abd8021e1906e7d7..4cdd2f430367f9b59109be29adbd1417416413e7 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -339,15 +339,18 @@ if install_tests
                 'auxv',
                 'journal-data',
                 'knot-data',
-                'test-journals',
-                'units',
+                'test-cgroup-mask',
+                'test-cgroup-unit-default',
+                'test-engine',
                 'test-execute',
                 'test-fstab-generator',
+                'test-journals',
+                'test-network',
+                'test-network-generator-conversion',
                 'test-path',
                 'test-path-util',
+                'test-sched-prio',
                 'test-umount',
-                'test-network',
-                'test-network-generator-conversion',
                 'integration-tests/TEST-07-PID1/TEST-07-PID1.units',
                 'integration-tests/TEST-03-JOBS/TEST-03-JOBS.units',
                 'integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units',
@@ -355,9 +358,15 @@ if install_tests
                 'integration-tests/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units',
                 'integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units',
                 'integration-tests/TEST-30-ONCLOCKCHANGE/TEST-30-ONCLOCKCHANGE.units',
+                'integration-tests/TEST-38-FREEZER/TEST-38-FREEZER.units',
                 'integration-tests/TEST-52-HONORFIRSTSHUTDOWN/TEST-52-HONORFIRSTSHUTDOWN.units',
+                'integration-tests/TEST-55-OOMD/TEST-55-OOMD.units',
+                'integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units',
                 'integration-tests/TEST-63-PATH/TEST-63-PATH.units',
+                'integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units',
+                'integration-tests/TEST-66-DEVICE-ISOLATION/TEST-66-DEVICE-ISOLATION.units',
                 'integration-tests/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units',
+                'units',
         ]
 
         foreach subdir : testdata_subdirs

diff --git a/test/units/daughter.service b/test/test-cgroup-mask/daughter.service
similarity index 100%
rename from test/units/daughter.service
rename to test/test-cgroup-mask/daughter.service

diff --git a/test/units/grandchild.service b/test/test-cgroup-mask/grandchild.service
similarity index 100%
rename from test/units/grandchild.service
rename to test/test-cgroup-mask/grandchild.service

diff --git a/test/units/nomem.slice b/test/test-cgroup-mask/nomem.slice
similarity index 100%
rename from test/units/nomem.slice
rename to test/test-cgroup-mask/nomem.slice

diff --git a/test/units/nomemleaf.service b/test/test-cgroup-mask/nomemleaf.service
similarity index 100%
rename from test/units/nomemleaf.service
rename to test/test-cgroup-mask/nomemleaf.service

diff --git a/test/units/parent-deep.slice b/test/test-cgroup-mask/parent-deep.slice
similarity index 100%
rename from test/units/parent-deep.slice
rename to test/test-cgroup-mask/parent-deep.slice

diff --git a/test/units/parent.slice b/test/test-cgroup-mask/parent.slice
similarity index 100%
rename from test/units/parent.slice
rename to test/test-cgroup-mask/parent.slice

diff --git a/test/units/son.service b/test/test-cgroup-mask/son.service
similarity index 100%
rename from test/units/son.service
rename to test/test-cgroup-mask/son.service

diff --git a/test/units/dml-discard-empty.service b/test/test-cgroup-unit-default/dml-discard-empty.service
similarity index 100%
rename from test/units/dml-discard-empty.service
rename to test/test-cgroup-unit-default/dml-discard-empty.service

diff --git a/test/units/dml-discard-set-ml.service b/test/test-cgroup-unit-default/dml-discard-set-ml.service
similarity index 100%
rename from test/units/dml-discard-set-ml.service
rename to test/test-cgroup-unit-default/dml-discard-set-ml.service

diff --git a/test/units/dml-discard.slice b/test/test-cgroup-unit-default/dml-discard.slice
similarity index 100%
rename from test/units/dml-discard.slice
rename to test/test-cgroup-unit-default/dml-discard.slice

diff --git a/test/units/dml-override-empty.service b/test/test-cgroup-unit-default/dml-override-empty.service
similarity index 100%
rename from test/units/dml-override-empty.service
rename to test/test-cgroup-unit-default/dml-override-empty.service

diff --git a/test/units/dml-override.slice b/test/test-cgroup-unit-default/dml-override.slice
similarity index 100%
rename from test/units/dml-override.slice
rename to test/test-cgroup-unit-default/dml-override.slice

diff --git a/test/units/dml-passthrough-empty.service b/test/test-cgroup-unit-default/dml-passthrough-empty.service
similarity index 100%
rename from test/units/dml-passthrough-empty.service
rename to test/test-cgroup-unit-default/dml-passthrough-empty.service

diff --git a/test/units/dml-passthrough-set-dml.service b/test/test-cgroup-unit-default/dml-passthrough-set-dml.service
similarity index 100%
rename from test/units/dml-passthrough-set-dml.service
rename to test/test-cgroup-unit-default/dml-passthrough-set-dml.service

diff --git a/test/units/dml-passthrough-set-ml.service b/test/test-cgroup-unit-default/dml-passthrough-set-ml.service
similarity index 100%
rename from test/units/dml-passthrough-set-ml.service
rename to test/test-cgroup-unit-default/dml-passthrough-set-ml.service

diff --git a/test/units/dml-passthrough.slice b/test/test-cgroup-unit-default/dml-passthrough.slice
similarity index 100%
rename from test/units/dml-passthrough.slice
rename to test/test-cgroup-unit-default/dml-passthrough.slice

diff --git a/test/units/dml.slice b/test/test-cgroup-unit-default/dml.slice
similarity index 100%
rename from test/units/dml.slice
rename to test/test-cgroup-unit-default/dml.slice

diff --git a/test/units/a-conj.service b/test/test-engine/a-conj.service
similarity index 100%
rename from test/units/a-conj.service
rename to test/test-engine/a-conj.service

diff --git a/test/units/a.service b/test/test-engine/a.service
similarity index 100%
rename from test/units/a.service
rename to test/test-engine/a.service

diff --git a/test/units/b.service b/test/test-engine/b.service
similarity index 100%
rename from test/units/b.service
rename to test/test-engine/b.service

diff --git a/test/units/basic.target b/test/test-engine/basic.target
similarity index 100%
rename from test/units/basic.target
rename to test/test-engine/basic.target

diff --git a/test/units/c.service b/test/test-engine/c.service
similarity index 100%
rename from test/units/c.service
rename to test/test-engine/c.service

diff --git a/test/units/d.service b/test/test-engine/d.service
similarity index 100%
rename from test/units/d.service
rename to test/test-engine/d.service

diff --git a/test/units/e.service b/test/test-engine/e.service
similarity index 100%
rename from test/units/e.service
rename to test/test-engine/e.service

diff --git a/test/units/f.service b/test/test-engine/f.service
similarity index 100%
rename from test/units/f.service
rename to test/test-engine/f.service

diff --git a/test/units/g.service b/test/test-engine/g.service
similarity index 100%
rename from test/units/g.service
rename to test/test-engine/g.service

diff --git a/test/units/h.service b/test/test-engine/h.service
similarity index 100%
rename from test/units/h.service
rename to test/test-engine/h.service

diff --git a/test/units/i.service b/test/test-engine/i.service
similarity index 100%
rename from test/units/i.service
rename to test/test-engine/i.service

diff --git a/test/units/sysinit.target b/test/test-engine/sysinit.target
similarity index 86%
rename from test/units/sysinit.target
rename to test/test-engine/sysinit.target
index eed3d16b458519b1ef6ecc99d24d4795538dc1b9..5187605a3c43c578a71ab62cb435cdc73d2f4ef6 100644 (file)
--- a/test/units/sysinit.target
+++ b/test/test-engine/sysinit.target
@@ -10,6 +10,8 @@
 [Unit]
 Description=System Initialization
 Documentation=man:systemd.special(7)
-Conflicts=emergency.service emergency.target
+
 Wants=local-fs.target swap.target
-After=local-fs.target swap.target emergency.service emergency.target
+After=local-fs.target swap.target
+Conflicts=emergency.service emergency.target
+Before=emergency.service emergency.target

diff --git a/test/units/unit-.service.d/10-override.conf b/test/test-engine/unit-.service.d/10-override.conf
similarity index 100%
rename from test/units/unit-.service.d/10-override.conf
rename to test/test-engine/unit-.service.d/10-override.conf

diff --git a/test/units/unit-with-.service.d/20-override.conf b/test/test-engine/unit-with-.service.d/20-override.conf
similarity index 100%
rename from test/units/unit-with-.service.d/20-override.conf
rename to test/test-engine/unit-with-.service.d/20-override.conf

diff --git a/test/units/unit-with-multiple-.service.d/20-override.conf b/test/test-engine/unit-with-multiple-.service.d/20-override.conf
similarity index 100%
rename from test/units/unit-with-multiple-.service.d/20-override.conf
rename to test/test-engine/unit-with-multiple-.service.d/20-override.conf

diff --git a/test/units/unit-with-multiple-.service.d/30-override.conf b/test/test-engine/unit-with-multiple-.service.d/30-override.conf
similarity index 100%
rename from test/units/unit-with-multiple-.service.d/30-override.conf
rename to test/test-engine/unit-with-multiple-.service.d/30-override.conf

diff --git a/test/units/unit-with-multiple-dashes.service b/test/test-engine/unit-with-multiple-dashes.service
similarity index 100%
rename from test/units/unit-with-multiple-dashes.service
rename to test/test-engine/unit-with-multiple-dashes.service

diff --git a/test/units/unit-with-multiple-dashes.service.d/10-override.conf b/test/test-engine/unit-with-multiple-dashes.service.d/10-override.conf
similarity index 100%
rename from test/units/unit-with-multiple-dashes.service.d/10-override.conf
rename to test/test-engine/unit-with-multiple-dashes.service.d/10-override.conf

diff --git a/test/units/sched_idle_bad.service b/test/test-sched-prio/sched_idle_bad.service
similarity index 100%
rename from test/units/sched_idle_bad.service
rename to test/test-sched-prio/sched_idle_bad.service

diff --git a/test/units/sched_idle_ok.service b/test/test-sched-prio/sched_idle_ok.service
similarity index 100%
rename from test/units/sched_idle_ok.service
rename to test/test-sched-prio/sched_idle_ok.service

diff --git a/test/units/sched_rr_bad.service b/test/test-sched-prio/sched_rr_bad.service
similarity index 100%
rename from test/units/sched_rr_bad.service
rename to test/test-sched-prio/sched_rr_bad.service

diff --git a/test/units/sched_rr_change.service b/test/test-sched-prio/sched_rr_change.service
similarity index 100%
rename from test/units/sched_rr_change.service
rename to test/test-sched-prio/sched_rr_change.service

diff --git a/test/units/sched_rr_ok.service b/test/test-sched-prio/sched_rr_ok.service
similarity index 100%
rename from test/units/sched_rr_ok.service
rename to test/test-sched-prio/sched_rr_ok.service

diff --git a/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh b/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh
index eaeee635db6a0ef47ed8e03521176c3483d966c7..ddeeb854bca688acf1603c5a27b7a66fcd5d76d1 100755 (executable)
--- a/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh
+++ b/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh
@@ -31,8 +31,8 @@ busctl call \
     org.freedesktop.systemd1.Manager StartTransientUnit \
     "ssa(sv)a(sa(sv))" "$TEST_UNIT" replace 4 \
       ExecStart "a(sasb)" 1 \
-        /usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh \
-        5 /usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh 2 "test:other" "Hello" "Extra" \
+        /usr/lib/systemd/tests/testdata/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh \
+        5 /usr/lib/systemd/tests/testdata/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh 2 "test:other" "Hello" "Extra" \
         true \
       RemainAfterExit "b" true \
       Type "s" oneshot \

diff --git a/test/units/TEST-23-UNIT-FILE.openfile.sh b/test/units/TEST-23-UNIT-FILE.openfile.sh
index 644b6f458ed45f2c9317b62425851e05007696c2..0e2e22a01d2a275950d2665e7e699f860bdd3834 100755 (executable)
--- a/test/units/TEST-23-UNIT-FILE.openfile.sh
+++ b/test/units/TEST-23-UNIT-FILE.openfile.sh
@@ -28,7 +28,7 @@ systemd-run -p DynamicUser=yes -p EnvironmentFile=-/usr/lib/systemd/systemd-asan
             -p RemainAfterExit=yes \
             --unit=test-23-openfile-existing.service \
             --service-type=oneshot \
-            /usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-openfile-child.sh 2 "open.txt:colon" "Open" "File"
+            /usr/lib/systemd/tests/testdata/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-child.sh 2 "open.txt:colon" "Open" "File"
 
 cmp <(systemctl show -p OpenFile test-23-openfile-existing.service) <<EOF
 OpenFile=/tmp/test-open-file/open.txt::read-only
@@ -43,7 +43,7 @@ systemctl start TEST-23-UNIT-FILE-openfile-server.socket
 
 systemd-run -p OpenFile=/tmp/test.sock:socket:read-only \
             --wait \
-            /usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-openfile-child.sh 1 "socket" "Socket"
+            /usr/lib/systemd/tests/testdata/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-child.sh 1 "socket" "Socket"
 
 systemctl stop TEST-23-UNIT-FILE-openfile-server.socket
 

diff --git a/test/units/TEST-65-ANALYZE.sh b/test/units/TEST-65-ANALYZE.sh
index 721f4ca80966bd312eab59b139e8366219b3074f..0c5b538cc9bb93187ae1b1b49a1a4827edf492aa 100755 (executable)
--- a/test/units/TEST-65-ANALYZE.sh
+++ b/test/units/TEST-65-ANALYZE.sh
@@ -510,6 +510,12 @@ systemd-analyze verify /tmp/testwarnings.service
 
 rm /tmp/testwarnings.service
 
+TESTDATA=/usr/lib/systemd/tests/testdata/TEST-65-ANALYZE.units
+systemd-analyze verify "${TESTDATA}/loopy.service"
+systemd-analyze verify "${TESTDATA}/loopy2.service"
+systemd-analyze verify "${TESTDATA}/loopy3.service"
+systemd-analyze verify "${TESTDATA}/loopy4.service"
+
 # Added an additional "INVALID_ID" id to the .json to verify that nothing breaks when input is malformed
 # The PrivateNetwork id description and weight was changed to verify that 'security' is actually reading in
 # values from the .json file when required. The default weight for "PrivateNetwork" is 2500, and the new weight

diff --git a/test/units/shutdown.target b/test/units/shutdown.target
deleted file mode 100644 (file)
index 582ae6b..0000000
--- a/test/units/shutdown.target
+++ /dev/null
@@ -1,14 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1-or-later
-#
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Shutdown
-Documentation=man:systemd.special(7)
-DefaultDependencies=no
-RefuseManualStart=yes

diff --git a/test/units/sockets.target b/test/units/sockets.target
deleted file mode 100644 (file)
index c6e20d7..0000000
--- a/test/units/sockets.target
+++ /dev/null
@@ -1,12 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1-or-later
-#
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Sockets
-Documentation=man:systemd.special(7)

diff --git a/test/units/timers.target b/test/units/timers.target
deleted file mode 100644 (file)
index 99f82e3..0000000
--- a/test/units/timers.target
+++ /dev/null
@@ -1,15 +0,0 @@
-#  SPDX-License-Identifier: LGPL-2.1-or-later
-#
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Timers
-Documentation=man:systemd.special(7)
-
-DefaultDependencies=no
-Conflicts=shutdown.target