aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-06-20 14:07:01 -0400
committerMichael Hirsch, Ph.D <scivision@users.noreply.github.com>2019-06-24 14:06:32 -0400
commit5b109c9ad27aea39ce49d1da8ef0c957ccaef3b9 (patch)
tree5c28afec73ad304f9e27e6a873492adb39b94139 /run_project_tests.py
parent59e5ad66f2017e17692d64e2aa7d745ea3fe849d (diff)
downloadmeson-5b109c9ad27aea39ce49d1da8ef0c957ccaef3b9.zip
meson-5b109c9ad27aea39ce49d1da8ef0c957ccaef3b9.tar.gz
meson-5b109c9ad27aea39ce49d1da8ef0c957ccaef3b9.tar.bz2
correct missing argument for IntelClFortranCompiler
ifort passes all tests cleanup logic
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-xrun_project_tests.py8
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),