diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-07-14 11:35:29 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-07-14 14:57:04 +0200 |
| commit | a18c7865bea4588932ff72de5630e40e1c1389b3 (patch) | |
| tree | 5552f2a7d15178dad90d16212a891539ec5e090e | |
| parent | 60b45a80c1f98bad000bd902d97ecf6c4e3fc315 (diff) | |
| download | systemd-a18c7865bea4588932ff72de5630e40e1c1389b3.tar.gz | |
meson: do not install testdata when -Dinstall-tests=false
Fixes #16447.
| -rw-r--r-- | test/meson.build | 100 |
1 files changed, 51 insertions, 49 deletions
diff --git a/test/meson.build b/test/meson.build index 8bda38a2e2..5d9fb5ab50 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,56 +1,58 @@ # SPDX-License-Identifier: LGPL-2.1+ -testdata_dir = testsdir + '/testdata/' - -install_subdir('journal-data', - install_dir : testdata_dir) -install_subdir('units', - install_dir : testdata_dir) -install_subdir('test-execute', - install_dir : testdata_dir) -install_subdir('test-path', - install_dir : testdata_dir) -install_subdir('test-umount', - install_dir : testdata_dir) -install_subdir('test-network-generator-conversion', - install_dir : testdata_dir) -install_subdir('testsuite-04.units', - install_dir : testdata_dir) -install_subdir('testsuite-06.units', - install_dir : testdata_dir) -install_subdir('testsuite-10.units', - install_dir : testdata_dir) -install_subdir('testsuite-11.units', - install_dir : testdata_dir) -install_subdir('testsuite-16.units', - install_dir : testdata_dir) -install_subdir('testsuite-28.units', - install_dir : testdata_dir) -install_subdir('testsuite-30.units', - install_dir : testdata_dir) -install_subdir('testsuite-52.units', - install_dir : testdata_dir) - -testsuite08_dir = testdata_dir + '/testsuite-08.units' -install_data('testsuite-08.units/-.mount', - install_dir : testsuite08_dir) -install_data('testsuite-08.units/systemd-remount-fs.service', - install_dir : testsuite08_dir) -meson.add_install_script(meson_make_symlink, - './-.mount', - testsuite08_dir + '/root.mount') -meson.add_install_script(meson_make_symlink, - '../-.mount', - testsuite08_dir + '/local-fs.target.wants/-.mount') - -if conf.get('ENABLE_RESOLVE') == 1 - install_subdir('test-resolve', +if install_tests + testdata_dir = testsdir + '/testdata/' + + install_subdir('journal-data', install_dir : testdata_dir) -endif + install_subdir('units', + install_dir : testdata_dir) + install_subdir('test-execute', + install_dir : testdata_dir) + install_subdir('test-path', + install_dir : testdata_dir) + install_subdir('test-umount', + install_dir : testdata_dir) + install_subdir('test-network-generator-conversion', + install_dir : testdata_dir) + install_subdir('testsuite-04.units', + install_dir : testdata_dir) + install_subdir('testsuite-06.units', + install_dir : testdata_dir) + install_subdir('testsuite-10.units', + install_dir : testdata_dir) + install_subdir('testsuite-11.units', + install_dir : testdata_dir) + install_subdir('testsuite-16.units', + install_dir : testdata_dir) + install_subdir('testsuite-28.units', + install_dir : testdata_dir) + install_subdir('testsuite-30.units', + install_dir : testdata_dir) + install_subdir('testsuite-52.units', + install_dir : testdata_dir) + + testsuite08_dir = testdata_dir + '/testsuite-08.units' + install_data('testsuite-08.units/-.mount', + install_dir : testsuite08_dir) + install_data('testsuite-08.units/systemd-remount-fs.service', + install_dir : testsuite08_dir) + meson.add_install_script(meson_make_symlink, + './-.mount', + testsuite08_dir + '/root.mount') + meson.add_install_script(meson_make_symlink, + '../-.mount', + testsuite08_dir + '/local-fs.target.wants/-.mount') + + if conf.get('ENABLE_RESOLVE') == 1 + install_subdir('test-resolve', + install_dir : testdata_dir) + endif -install_data('create-busybox-container', - install_mode : 'rwxr-xr-x', - install_dir : testdata_dir) + install_data('create-busybox-container', + install_mode : 'rwxr-xr-x', + install_dir : testdata_dir) +endif test_network_generator_conversion_sh = find_program('test-network-generator-conversion.sh') |