test: install integration-test-setup.sh in testdata/

integration-test-setup.sh is an auxiliary script that tests rely on at
runtime. As such, install the script in testdata/.

Follow-up for af153e36ae67c242251951c12d6d6b6ae4783845.

diff --git a/test/meson.build b/test/meson.build
index 9d1a069fc92c3289fb54c2d556e55330229758e9..ceebb72bae0162624e5e08959236b3bd6993b98d 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -142,11 +142,13 @@ endif
 ############################################################
 
 if install_tests
-        foreach script : ['integration-test-setup.sh', 'run-unit-tests.py']
-                install_data(script,
-                             install_mode : 'rwxr-xr-x',
-                             install_dir : testsdir)
-        endforeach
+        install_data('run-unit-tests.py',
+                     install_mode : 'rwxr-xr-x',
+                     install_dir : testsdir)
+
+        install_data('integration-test-setup.sh',
+                     install_mode : 'rwxr-xr-x',
+                     install_dir : testdata_dir)
 endif
 
 ############################################################

diff --git a/test/test.service.in b/test/test.service.in
index 48c09baf6cca5f2347623a925a350b23ff5f6256..6400be07002888e0658894a36fca4277c79e3bfd 100644 (file)
--- a/test/test.service.in
+++ b/test/test.service.in
@@ -7,9 +7,9 @@ Before=getty-pre.target
 
 [Service]
 ExecStartPre=rm -f /failed /testok
-ExecStartPre=/usr/lib/systemd/tests/integration-test-setup.sh setup
+ExecStartPre=/usr/lib/systemd/tests/testdata/integration-test-setup.sh setup
 ExecStart=@command@
-ExecStopPost=/usr/lib/systemd/tests/integration-test-setup.sh finalize
+ExecStopPost=/usr/lib/systemd/tests/testdata/integration-test-setup.sh finalize
 Type=oneshot
 MemoryAccounting=@memory-accounting@
 StateDirectory=%N