summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-01-08 00:11:41 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-01-08 00:11:41 +0200
commitdbef7a816ab41c662a20fe5bf29d321326243fa2 (patch)
treefc59d3e346016f725202089b73a8829ad1d0459e
parent5133d8650fb12e1635fda6a36794fdff9262bb7a (diff)
downloadmeson-dbef7a816ab41c662a20fe5bf29d321326243fa2.tar.gz
Only run Boost tests on osx if it is actually installed.osxboost
-rwxr-xr-xrun_project_tests.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index d442dd326..74e4ca76a 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -496,7 +496,11 @@ def detect_tests_to_run():
if mesonlib.is_windows():
# TODO: Set BOOST_ROOT in .appveyor.yml
gathered_tests += [('framework', ['test cases/frameworks/1 boost'], 'BOOST_ROOT' not in os.environ)]
- elif mesonlib.is_osx() or mesonlib.is_cygwin():
+ elif mesonlib.is_osx():
+ if os.path.exists('/usr/local/include/boost'):
+ # Just do the BOOST test
+ gathered_tests += [('framework', ['test cases/frameworks/1 boost'], False)]
+ elif mesonlib.is_cygwin():
# Just do the BOOST test
gathered_tests += [('framework', ['test cases/frameworks/1 boost'], False)]
else: