diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-06-24 16:41:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 16:41:10 -0700 |
| commit | ec97bedd8afbf3bcb53b03365fb06fcf8c51b516 (patch) | |
| tree | e468478fa96d3dd7bd96735008e82c756d884e5e /run_project_tests.py | |
| parent | e2039da5d99dc8fe4255069ef8ab14459766bf2d (diff) | |
| parent | f990c3eee456a186548dcc48f1d2dca5d8172fe4 (diff) | |
| download | meson-ec97bedd8afbf3bcb53b03365fb06fcf8c51b516.zip meson-ec97bedd8afbf3bcb53b03365fb06fcf8c51b516.tar.gz meson-ec97bedd8afbf3bcb53b03365fb06fcf8c51b516.tar.bz2 | |
Merge pull request #5524 from scivision/icl_ifort
Add ifort on Windows
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index c15b93b..3bd3253 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -600,6 +600,12 @@ def detect_tests_to_run(only: List[str]) -> List[Tuple[str, List[Path], bool]]: gathered_tests: list of tuple of str, list of pathlib.Path, bool tests to run """ + + ninja_fortran_compiler = shutil.which('gfortran') or shutil.which('flang') or shutil.which('pgfortran') or (not mesonlib.is_windows() and shutil.which('ifort')) + ninja_fortran = backend is Backend.ninja and ninja_fortran_compiler + vs_fortran = mesonlib.is_windows() and backend is Backend.vs and shutil.which('ifort') + skip_fortran = not(ninja_fortran or vs_fortran) + # Name, subdirectory, skip condition. all_tests = [ ('cmake', 'cmake', not shutil.which('cmake') or (os.environ.get('compiler') == 'msvc2015' and under_ci)), @@ -621,7 +627,7 @@ def detect_tests_to_run(only: List[str]) -> List[Tuple[str, List[Path], bool]]: ('d', 'd', backend is not Backend.ninja or not have_d_compiler()), ('objective c', 'objc', backend not in (Backend.ninja, Backend.xcode) or not have_objc_compiler()), ('objective c++', 'objcpp', backend not in (Backend.ninja, Backend.xcode) or not have_objcpp_compiler()), - ('fortran', 'fortran', backend is not Backend.ninja or not shutil.which('gfortran')), + ('fortran', 'fortran', skip_fortran), ('swift', 'swift', backend not in (Backend.ninja, Backend.xcode) or not shutil.which('swiftc')), ('cuda', 'cuda', backend not in (Backend.ninja, Backend.xcode) or not shutil.which('nvcc')), ('python3', 'python3', backend is not Backend.ninja), |