aboutsummaryrefslogtreecommitdiff
path: root/meson_test.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-03-27 19:09:26 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-03-27 19:09:26 +0200
commite46c1743ce2b0dbf722acac5412d95c64888b33b (patch)
treee8c9958fed66a38b89d08346bb9e11dbda3ef2f8 /meson_test.py
parent00e07e4b3a65d15a9e2ff34cfd0bbc43d96fd229 (diff)
downloadmeson-e46c1743ce2b0dbf722acac5412d95c64888b33b.zip
meson-e46c1743ce2b0dbf722acac5412d95c64888b33b.tar.gz
meson-e46c1743ce2b0dbf722acac5412d95c64888b33b.tar.bz2
Allow use of external test executables. Closes #89.
Diffstat (limited to 'meson_test.py')
-rwxr-xr-xmeson_test.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/meson_test.py b/meson_test.py
index 51a7db6..65f9899 100755
--- a/meson_test.py
+++ b/meson_test.py
@@ -65,10 +65,10 @@ def run_with_mono(fname):
def run_single_test(wrap, test):
global tests_failed
- if test.fname.endswith('.jar'):
- cmd = ['java', '-jar', test.fname]
- elif run_with_mono(test.fname):
- cmd = ['mono', test.fname]
+ if test.fname[0].endswith('.jar'):
+ cmd = ['java', '-jar'] + test.fname
+ elif run_with_mono(test.fname[0]):
+ cmd = ['mono'] + test.fname
else:
if test.is_cross:
if test.exe_runner is None:
@@ -76,9 +76,9 @@ def run_single_test(wrap, test):
# because there is no execute wrapper.
cmd = None
else:
- cmd = [test.exe_runner, test.fname]
+ cmd = [test.exe_runner] + test.fname
else:
- cmd = [test.fname]
+ cmd = test.fname
if len(wrap) > 0 and 'valgrind' in wrap[0]:
wrap += test.valgrind_args
if cmd is None: