Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

20 files changed, 11 insertions, 2 deletions

diff --git a/test/testsuite-03.units/always-activating.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.service
index 93ddb85..93ddb85 100644
--- a/test/testsuite-03.units/always-activating.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.service
diff --git a/test/testsuite-03.units/always-activating.socket b/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.socket
index c76fed2..c76fed2 100644
--- a/test/testsuite-03.units/always-activating.socket
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.socket
diff --git a/test/testsuite-03.units/fails-on-restart-restartdirect.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.service
index 60ffd7a..60ffd7a 100644
--- a/test/testsuite-03.units/fails-on-restart-restartdirect.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.service
diff --git a/test/testsuite-03.units/fails-on-restart-restartdirect.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.target
index 58e2561..58e2561 100644
--- a/test/testsuite-03.units/fails-on-restart-restartdirect.target
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.target
diff --git a/test/testsuite-03.units/fails-on-restart.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.service
index fb7e7ae..fb7e7ae 100644
--- a/test/testsuite-03.units/fails-on-restart.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.service
diff --git a/test/testsuite-03.units/fails-on-restart.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.target
index 865fb2a..865fb2a 100644
--- a/test/testsuite-03.units/fails-on-restart.target
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.target
diff --git a/test/testsuite-03.units/hello-after-sleep.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/hello-after-sleep.target
index b0ddb30..b0ddb30 100644
--- a/test/testsuite-03.units/hello-after-sleep.target
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/hello-after-sleep.target
diff --git a/test/testsuite-03.units/hello.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/hello.service
index 0c3f2f8..0c3f2f8 100644
--- a/test/testsuite-03.units/hello.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/hello.service
diff --git a/test/testsuite-03.units/propagatestopto-and-pullin.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-and-pullin.target
index 8e409af..8e409af 100644
--- a/test/testsuite-03.units/propagatestopto-and-pullin.target
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-and-pullin.target
diff --git a/test/testsuite-03.units/propagatestopto-indirect.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-indirect.target
index e8229a7..e8229a7 100644
--- a/test/testsuite-03.units/propagatestopto-indirect.target
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-indirect.target
diff --git a/test/testsuite-03.units/propagatestopto-only.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-only.target
index 327b7c1..327b7c1 100644
--- a/test/testsuite-03.units/propagatestopto-only.target
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-only.target
diff --git a/test/testsuite-03.units/sleep-infinity-simple.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep-infinity-simple.service
index 211346d..211346d 100644
--- a/test/testsuite-03.units/sleep-infinity-simple.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep-infinity-simple.service
diff --git a/test/testsuite-03.units/sleep.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep.service
index 32c2037..32c2037 100644
--- a/test/testsuite-03.units/sleep.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep.service
diff --git a/test/testsuite-03.units/succeeds-on-restart-restartdirect.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.service
index b05f2f8..a2b9c33 100644
--- a/test/testsuite-03.units/succeeds-on-restart-restartdirect.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/testsuite-03.units/succeeds-on-restart.sh
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-03-JOBS.units/succeeds-on-restart.sh
 Restart=on-failure
 RestartMode=direct
diff --git a/test/testsuite-03.units/succeeds-on-restart-restartdirect.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.target
index 2cf3c60..2cf3c60 100644
--- a/test/testsuite-03.units/succeeds-on-restart-restartdirect.target
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.target
diff --git a/test/testsuite-03.units/succeeds-on-restart.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.service
index d7b3c7a..d0e9c2b 100644
--- a/test/testsuite-03.units/succeeds-on-restart.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.service
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/testsuite-03.units/succeeds-on-restart.sh
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-03-JOBS.units/succeeds-on-restart.sh
 Restart=on-failure
 RestartMode=normal
diff --git a/test/testsuite-03.units/succeeds-on-restart.sh b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.sh
index 1428b18..1428b18 100755
--- a/test/testsuite-03.units/succeeds-on-restart.sh
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.sh
diff --git a/test/testsuite-03.units/succeeds-on-restart.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.target
index eb82f47..eb82f47 100644
--- a/test/testsuite-03.units/succeeds-on-restart.target
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.target
diff --git a/test/testsuite-03.units/unstoppable.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/unstoppable.service
index 6eb7c19..6eb7c19 100644
--- a/test/testsuite-03.units/unstoppable.service
+++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/unstoppable.service
diff --git a/test/TEST-03-JOBS/meson.build b/test/TEST-03-JOBS/meson.build
new file mode 100644
index 0000000..3484d21
--- /dev/null
+++ b/test/TEST-03-JOBS/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+integration_tests += [
+        integration_test_template + {
+                'name' : fs.name(meson.current_source_dir()),
+        },
+]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-03-JOBS.units']