aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-04-02 21:23:31 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-04-02 21:23:31 +0300
commit6024f277dc413eeef2bac121091417638bee3295 (patch)
treed81193faaf53cafb43529bcb60badaf303a27399
parentf4261e6976bd801991fbf8fa9dfef0a914e9b3ff (diff)
downloadmeson-6024f277dc413eeef2bac121091417638bee3295.zip
meson-6024f277dc413eeef2bac121091417638bee3295.tar.gz
meson-6024f277dc413eeef2bac121091417638bee3295.tar.bz2
Do not run Java tests on OSX because starting from Mavericks it has a fake javac program that just annoys you with a popup.
-rwxr-xr-xrun_tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/run_tests.py b/run_tests.py
index 8e8e69e..96fff21 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -177,7 +177,7 @@ def run_tests():
frameworktests = gather_tests('test cases/frameworks')
else:
frameworktests = []
- if shutil.which('javac'):
+ if not environment.is_osx() and shutil.which('javac'):
javatests = gather_tests('test cases/java')
else:
javatests = []