summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLukáš Ondráček <lukas.ondracek@nic.cz>2024-07-30 17:05:47 +0200
committerLukáš Ondráček <lukas.ondracek@nic.cz>2024-07-30 17:05:47 +0200
commit6834751d0f1e943d4b0db19a86f52fe45d9a9105 (patch)
treee2a4f4b6644dceb521e29b3af804c4596e81b676 /tests
parentdefer: fix/hide tidy/trivial_checks warnings (diff)
parentMerge branch 'manager-tls-session-ticket-secret' into 'master' (diff)
downloadknot-resolver-6834751d0f1e943d4b0db19a86f52fe45d9a9105.tar.xz
knot-resolver-6834751d0f1e943d4b0db19a86f52fe45d9a9105.zip
Merge branch 'master' into rrl-wip
Diffstat (limited to 'tests')
-rw-r--r--tests/config/meson.build7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/config/meson.build b/tests/config/meson.build
index dc345a88..2a9e2487 100644
--- a/tests/config/meson.build
+++ b/tests/config/meson.build
@@ -22,8 +22,11 @@ foreach config_test : config_tests
conftest_env.prepend('PATH', sbin_dir)
conftest_env.set('KRESD_NO_LISTEN', '1')
conftest_env.set('SOURCE_PATH', meson.current_source_dir())
- conftest_env.set(
- 'TEST_FILE', '@0@/@1@'.format(meson.source_root(), config_test[1][0]))
+ if meson.version().version_compare('>=1.4')
+ conftest_env.set('TEST_FILE', '@0@'.format(config_test[1][0].full_path()))
+ else
+ conftest_env.set('TEST_FILE', '@0@/@1@'.format(meson.source_root(), config_test[1][0]))
+ endif
test(
'config.' + config_test[0],