From 514d9e16650e74bed705d087018c6e5eaf0819ad Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 7 Nov 2024 16:37:13 +0100 Subject: [PATCH] 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. --- test/meson.build | 12 +++++++----- test/test.service.in | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/test/meson.build b/test/meson.build index 9d1a069fc92..ceebb72bae0 100644 --- 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 48c09baf6cc..6400be07002 100644 --- 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 -- 2.47.3