From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 4 Mar 2019 10:42:04 +0000 (+0100)
Subject: meson: tests/config - fix handling of environment to run correct test
X-Git-Tag: v4.0.0~24^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b5ff76f2d0dd46b8fe56588854cd08785be3bd;p=thirdparty%2Fknot-resolver.git

meson: tests/config - fix handling of environment to run correct test

Closes #452
---

diff --git a/tests/config/meson.build b/tests/config/meson.build
index dcba74662..a4d62c7f4 100644
--- a/tests/config/meson.build
+++ b/tests/config/meson.build
@@ -25,11 +25,6 @@ config_tests += [
 
 run_configtest = find_program('../../scripts/test-config.sh')
 
-# environment variables for test
-conftest_env = environment()
-conftest_env.prepend('PATH', sbin_dir)
-conftest_env.set('KRESD_NO_LISTEN', '1')
-conftest_env.set('SOURCE_PATH', meson.current_source_dir())
 
 foreach config_test : config_tests
   # kresd arguments
@@ -44,8 +39,14 @@ foreach config_test : config_tests
   # kresd return code check
   conftest_should_fail = config_test.length() >= 4 ? config_test[3] : false
 
+  # environment variables for test
+  conftest_env = environment()
+  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]))
+
   test(
     'config.' + config_test[0],
     run_configtest,