diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-07-30 01:23:40 -0400 |
|---|---|---|
| committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-07-30 03:14:25 -0400 |
| commit | 667cc80f7225930eb8b239683c8297a717a087d6 (patch) | |
| tree | 3e3dd1d7922dc508006e888294f46a48530a29eb /run_project_tests.py | |
| parent | 3d18da0de3a3b650aa40e71a3215c9682db239a0 (diff) | |
| download | meson-667cc80f7225930eb8b239683c8297a717a087d6.zip meson-667cc80f7225930eb8b239683c8297a717a087d6.tar.gz meson-667cc80f7225930eb8b239683c8297a717a087d6.tar.bz2 | |
run_tests: ifort / intel-cl must have ninja backend
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index d517fd3..14f3c59 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -611,10 +611,8 @@ def detect_tests_to_run(only: List[str]) -> List[Tuple[str, List[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) + skip_fortran = not(shutil.which('gfortran') or shutil.which('flang') or + shutil.which('pgfortran') or shutil.which('ifort')) # Name, subdirectory, skip condition. all_tests = [ @@ -637,7 +635,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', skip_fortran), + ('fortran', 'fortran', skip_fortran or backend != Backend.ninja), ('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), |