aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-01-08 00:11:41 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-01-09 00:07:17 +0200
commit70902cefc3a25a00605c8a3023f292ea2e9a73d9 (patch)
treeb4f0d79538b959a4bee0671e9a304bd8cc910140 /run_project_tests.py
parent4f948ccf45e31acdbccd5e03d0c5e2860e71d62c (diff)
downloadmeson-70902cefc3a25a00605c8a3023f292ea2e9a73d9.zip
meson-70902cefc3a25a00605c8a3023f292ea2e9a73d9.tar.gz
meson-70902cefc3a25a00605c8a3023f292ea2e9a73d9.tar.bz2
Only run Boost tests on osx if it is actually installed.
Diffstat (limited to 'run_project_tests.py')
-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 d442dd3..74e4ca7 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: