diff options
| author | Franck Bui <fbui@suse.com> | 2023-03-17 14:14:16 +0100 |
|---|---|---|
| committer | Franck Bui <fbui@suse.com> | 2023-03-24 14:10:02 +0100 |
| commit | 539ee7ab11bed7925820e32194542bdccd7a1789 (patch) | |
| tree | 6efd6c54bc6d2779b948063d26d12724f06b5d4d | |
| parent | 26c2b30277f5a4c7656b732d2093000ffa895297 (diff) | |
| download | systemd-539ee7ab11bed7925820e32194542bdccd7a1789.tar.gz | |
meson: define testdata_dir globally
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | test/meson.build | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 100bf54506..0d175d2cee 100644 --- a/meson.build +++ b/meson.build @@ -202,6 +202,7 @@ factorydir = datadir / 'factory' bootlibdir = prefixdir / 'lib/systemd/boot/efi' testsdir = prefixdir / 'lib/systemd/tests' unittestsdir = testsdir / 'unit-tests' +testdata_dir = testsdir / 'testdata' systemdstatedir = localstatedir / 'lib/systemd' catalogstatedir = systemdstatedir / 'catalog' randomseeddir = localstatedir / 'lib/systemd' @@ -275,7 +276,7 @@ conf.set_quoted('SYSTEMD_LANGUAGE_FALLBACK_MAP', pkgdatadir / 'lang conf.set_quoted('SYSTEMD_MAKEFS_PATH', rootlibexecdir / 'systemd-makefs') conf.set_quoted('SYSTEMD_PULL_PATH', rootlibexecdir / 'systemd-pull') conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH', rootlibexecdir / 'systemd-shutdown') -conf.set_quoted('SYSTEMD_TEST_DATA', testsdir / 'testdata') +conf.set_quoted('SYSTEMD_TEST_DATA', testdata_dir) conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', rootbindir / 'systemd-tty-ask-password-agent') conf.set_quoted('SYSTEMD_UPDATE_HELPER_PATH', rootlibexecdir / 'systemd-update-helper') conf.set_quoted('SYSTEMD_USERWORK_PATH', rootlibexecdir / 'systemd-userwork') diff --git a/test/meson.build b/test/meson.build index 4bd7376c62..a05b667208 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,8 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later if install_tests - testdata_dir = testsdir + '/testdata/' - foreach subdir : [ 'auxv', 'journal-data', |