summaryrefslogtreecommitdiffstats
path: root/tests/config
diff options
context:
space:
mode:
authorVladimír Čunát <vladimir.cunat@nic.cz>2024-06-05 09:59:30 +0200
committerVladimír Čunát <vladimir.cunat@nic.cz>2024-06-05 10:01:08 +0200
commite805b98460879d8d5a88267aa302e44db04e0dfd (patch)
treeb73acf0919882ee5ea99b14f477e3f4eed659d61 /tests/config
parentmeson.build: avoid a gcc 14 warning (diff)
downloadknot-resolver-e805b98460879d8d5a88267aa302e44db04e0dfd.tar.xz
knot-resolver-e805b98460879d8d5a88267aa302e44db04e0dfd.zip
**/meson.build: avoid deprecations in meson >= 1.4
The code isn't pretty, but probably better than watching the fat red lines on every build.
Diffstat (limited to 'tests/config')
-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],