exchange

commit ad4255f9d717259c28ad73e98e69371f93fa4fca
parent 2110963f2d8bb953903c0d66972e203b006a4387
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sun, 11 Oct 2026 13:57:16 +0200

enforce our install target dir is used when running the tests

Diffstat:
M
meson.build
 | 
32
++++++++++++++++----------------

1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/meson.build b/meson.build
@@ -328,32 +328,32 @@ if not get_option('only-doc')
     endif
 
     taler_prefix = get_option('prefix') / get_option('libdir')
+    taler_bindir = get_option('prefix') / get_option('bindir')
+
+    # Tests exec helper binaries by bare name (execvp), so make sure the
+    # binaries installed into *our* prefix win over whatever else happens
+    # to be in the ambient PATH.
+    test_env_vars = {
+        'TALER_EXCHANGE_PREFIX': taler_prefix,
+        'TALER_AUDITOR_PREFIX': taler_prefix,
+    }
+    test_env = environment(test_env_vars)
+    test_env.prepend('PATH', taler_bindir)
+    valgrind_test_env = environment(test_env_vars + {'TALER_VALGRIND': '1'})
+    valgrind_test_env.prepend('PATH', taler_bindir)
 
     # Default setup only does unit tests
     add_test_setup(
         'default',
-        env: [
-            'TALER_EXCHANGE_PREFIX=' + taler_prefix,
-            'TALER_AUDITOR_PREFIX=' + taler_prefix,
-        ],
+        env: test_env,
         exclude_suites: ['perf', 'installcheck', 'integrationtests'],
         is_default: true,
     )
-    add_test_setup(
-        'all',
-        env: [
-            'TALER_EXCHANGE_PREFIX=' + taler_prefix,
-            'TALER_AUDITOR_PREFIX=' + taler_prefix,
-        ],
-    )
+    add_test_setup('all', env: test_env)
     # Unit tests under valgrind; honoured by src/exchangedb/test_table.sh
     add_test_setup(
         'valgrind',
-        env: [
-            'TALER_EXCHANGE_PREFIX=' + taler_prefix,
-            'TALER_AUDITOR_PREFIX=' + taler_prefix,
-            'TALER_VALGRIND=1',
-        ],
+        env: valgrind_test_env,
         exclude_suites: ['perf', 'installcheck', 'integrationtests'],
         timeout_multiplier: 20,
     )