diff options
| author | Franck Bui <fbui@suse.com> | 2024-11-07 16:37:13 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-11-08 12:37:40 +0100 |
| commit | 514d9e16650e74bed705d087018c6e5eaf0819ad (patch) | |
| tree | 2c64afbbedfd4115fa9090dc6dd76d14a22a6690 | |
| parent | update TODO (diff) | |
| download | systemd-514d9e16650e74bed705d087018c6e5eaf0819ad.tar.xz systemd-514d9e16650e74bed705d087018c6e5eaf0819ad.zip | |
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.
| -rw-r--r-- | test/meson.build | 12 | ||||
| -rw-r--r-- | test/test.service.in | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/test/meson.build b/test/meson.build index 9d1a069fc9..ceebb72bae 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 48c09baf6c..6400be0700 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 |