diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-11 22:41:27 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-11 22:41:27 +0200 |
commit | a2cb207762b466f471e63e6b5d1a84adf8874767 (patch) | |
tree | ad917026ad43761f70e6c9e1f6b87c011ab7bf41 /meson_test.py | |
parent | efc79fb85e179aec94faf2f6946d0c23d2e5ee0f (diff) | |
download | meson-a2cb207762b466f471e63e6b5d1a84adf8874767.zip meson-a2cb207762b466f471e63e6b5d1a84adf8874767.tar.gz meson-a2cb207762b466f471e63e6b5d1a84adf8874767.tar.bz2 |
Run Java tests as part of test suite.
Diffstat (limited to 'meson_test.py')
-rwxr-xr-x | meson_test.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/meson_test.py b/meson_test.py index 9d18979..68d5386 100755 --- a/meson_test.py +++ b/meson_test.py @@ -41,15 +41,18 @@ def write_log(logfile, test_name, result_str, stdo, stde): def run_single_test(wrap, test): global tests_failed - if test.is_cross: - if test.exe_runner is None: - # 'Can not run test on cross compiled executable - # because there is no execute wrapper. - cmd = None - else: - cmd = [test.exe_runner, test.fname] + if test.fname.endswith('.jar'): + cmd = ['java', '-jar', test.fname] else: - cmd = [test.fname] + if test.is_cross: + if test.exe_runner is None: + # Can not run test on cross compiled executable + # because there is no execute wrapper. + cmd = None + else: + cmd = [test.exe_runner, test.fname] + else: + cmd = [test.fname] if cmd is None: res = 'SKIP' duration = 0.0 |