diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-08 17:44:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 17:44:18 -0500 |
| commit | 7408862db800a171eda419d8947be55c107832f2 (patch) | |
| tree | 089b5a2cc2f4594b20bdd310cc437a2ad6c8409f /run_project_tests.py | |
| parent | a2262103fb749b570c4096b43ee107ad7143c04e (diff) | |
| parent | 377fe510033043555ed1824362f6db9935547707 (diff) | |
| download | meson-7408862db800a171eda419d8947be55c107832f2.zip meson-7408862db800a171eda419d8947be55c107832f2.tar.gz meson-7408862db800a171eda419d8947be55c107832f2.tar.bz2 | |
Merge pull request #1005 from centricular/javac-no-java
javac: Don't fail if there's no JVM
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 22e92b8..e373ffa 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -338,7 +338,7 @@ def detect_tests_to_run(): all_tests.append(('platform-windows', gather_tests('test cases/windows'), False if mesonlib.is_windows() else True)) all_tests.append(('platform-linux', gather_tests('test cases/linuxlike'), False if not (mesonlib.is_osx() or mesonlib.is_windows()) else True)) all_tests.append(('framework', gather_tests('test cases/frameworks'), False if not mesonlib.is_osx() and not mesonlib.is_windows() else True)) - all_tests.append(('java', gather_tests('test cases/java'), False if not mesonlib.is_osx() and shutil.which('javac') else True)) + all_tests.append(('java', gather_tests('test cases/java'), False if not mesonlib.is_osx() and shutil.which('javac') and shutil.which('java') else True)) all_tests.append(('C#', gather_tests('test cases/csharp'), False if shutil.which('mcs') else True)) all_tests.append(('vala', gather_tests('test cases/vala'), False if shutil.which('valac') else True)) all_tests.append(('rust', gather_tests('test cases/rust'), False if shutil.which('rustc') else True)) |