diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-09 23:18:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-09 23:18:10 +0300 |
| commit | 1d709400210e40ad06ed463656d5071cc39ac1be (patch) | |
| tree | 613c743727e25eb6fa450f0ea5c3191b2a484596 /mesonbuild/scripts | |
| parent | f9910d2c113e4d593dc1fe4099c52dc3fb828c9c (diff) | |
| parent | 1f76b76a84cb635f764ecbd2b77aaba1d375d72b (diff) | |
| download | meson-1d709400210e40ad06ed463656d5071cc39ac1be.zip meson-1d709400210e40ad06ed463656d5071cc39ac1be.tar.gz meson-1d709400210e40ad06ed463656d5071cc39ac1be.tar.bz2 | |
Merge pull request #582 from trhd/master
Valgrind fixes
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/meson_test.py | 7 |
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) |