aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/run_tests.py b/run_tests.py
index 38c65c5..f91ec85 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'