diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-01-06 14:41:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 14:41:26 +0200 |
| commit | 6c97d8d94d603a07116224e29e5ab05f960f8de9 (patch) | |
| tree | 08cf4fe35e8da3454e2747f025b3fb7ed68da1a4 /run_project_tests.py | |
| parent | 711c3a28ba62a2030089f4ddadb0360a46fc30c1 (diff) | |
| parent | fd683a2b81ae6398674b21f2047f7db340a1e556 (diff) | |
| download | meson-6c97d8d94d603a07116224e29e5ab05f960f8de9.zip meson-6c97d8d94d603a07116224e29e5ab05f960f8de9.tar.gz meson-6c97d8d94d603a07116224e29e5ab05f960f8de9.tar.bz2 | |
Merge pull request #2879 from jon-turney/fix-boost-cygwin
Fix dependency('boost') on Cygwin
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 384dbcc..0bf5f31 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -495,12 +495,9 @@ 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(): + elif mesonlib.is_osx() or mesonlib.is_cygwin(): # 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)] return gathered_tests |