aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/scripts/meson_test.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/scripts/meson_test.py b/mesonbuild/scripts/meson_test.py
index 524dc7a..33b6165 100644
--- a/mesonbuild/scripts/meson_test.py
+++ b/mesonbuild/scripts/meson_test.py
@@ -110,8 +110,6 @@ def run_single_test(wrap, test):
cmd = [test.exe_runner] + test.fname
else:
cmd = test.fname
- if len(wrap) > 0 and 'valgrind' in wrap[0]:
- wrap += test.valgrind_args
if cmd is None:
res = 'SKIP'
duration = 0.0
@@ -119,7 +117,10 @@ def run_single_test(wrap, test):
stde = None
returncode = -1
else:
- cmd = wrap + cmd + test.cmd_args
+ if len(wrap) > 0 and 'valgrind' in wrap[0]:
+ cmd = wrap + test.valgrind_args + cmd + test.cmd_args
+ else:
+ cmd = wrap + cmd + test.cmd_args
starttime = time.time()
child_env = os.environ.copy()
child_env.update(test.env)