diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-07-30 18:21:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 18:21:30 +0300 |
| commit | 3e54719ab810fa5a01b786810ca4df2db892c895 (patch) | |
| tree | eeea69d8bf0908b76d14877a71600b5ada3ce814 /run_tests.py | |
| parent | 1e53f67187a5df2eff19e65416f4e4c8d06f6257 (diff) | |
| parent | b5e9ab8ed02629c14050d86815fa2eb69c6425a2 (diff) | |
| download | meson-3e54719ab810fa5a01b786810ca4df2db892c895.zip meson-3e54719ab810fa5a01b786810ca4df2db892c895.tar.gz meson-3e54719ab810fa5a01b786810ca4df2db892c895.tar.bz2 | |
Merge pull request #5740 from scivision/intel-ci_fix
tests: Intel-cl fixes for Fortran
Diffstat (limited to 'run_tests.py')
| -rwxr-xr-x | run_tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/run_tests.py b/run_tests.py index 38c65c5..6a42681 100755 --- a/run_tests.py +++ b/run_tests.py @@ -34,11 +34,13 @@ from mesonbuild import mlog from mesonbuild.environment import Environment, detect_ninja from mesonbuild.coredata import backendlist -def guess_backend(backend, msbuild_exe): +def guess_backend(backend, msbuild_exe: str): # Auto-detect backend if unspecified backend_flags = [] if backend is None: - if msbuild_exe is not None and mesonlib.is_windows(): + if (msbuild_exe is not None and + mesonlib.is_windows() and not + (os.environ.get('CC') == 'icl' or os.environ.get('CXX') == 'icl' or os.environ.get('FC') == 'ifort')): backend = 'vs' # Meson will auto-detect VS version to use else: backend = 'ninja' |