diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-01-02 22:17:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-02 22:17:23 +0200 |
| commit | c814f1145bc521efd0a46b033751a6f844d24df5 (patch) | |
| tree | 2dbfc2a9b19b8d20b115adec8f7697e4840266cf /run_project_tests.py | |
| parent | ad54bc372694cf7fc6e173e41c56418651aac9f0 (diff) | |
| parent | d5eeda56b3d22f95c9145d048362100196f6ccd2 (diff) | |
| download | meson-c814f1145bc521efd0a46b033751a6f844d24df5.zip meson-c814f1145bc521efd0a46b033751a6f844d24df5.tar.gz meson-c814f1145bc521efd0a46b033751a6f844d24df5.tar.bz2 | |
Merge pull request #2824 from bredelings/fix-boost
Fix boost on mac and linux: correctly search for boost and set -mt suffix when needed.
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 323f9a3..384dbcc 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -495,7 +495,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(): + # Just do the BOOST test + gathered_tests += [('framework', ['test cases/frameworks/1 boost'], False)] + elif mesonlib.is_cygwin(): + # Skip all the framework tests gathered_tests += [('framework', gather_tests('test cases/frameworks'), True)] else: gathered_tests += [('framework', gather_tests('test cases/frameworks'), False)] |