From 667cc80f7225930eb8b239683c8297a717a087d6 Mon Sep 17 00:00:00 2001 From: "Michael Hirsch, Ph.D" Date: Tue, 30 Jul 2019 01:23:40 -0400 Subject: run_tests: ifort / intel-cl must have ninja backend --- run_tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'run_tests.py') 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' -- cgit v1.1 From b5e9ab8ed02629c14050d86815fa2eb69c6425a2 Mon Sep 17 00:00:00 2001 From: "Michael Hirsch, Ph.D" Date: Tue, 30 Jul 2019 01:25:22 -0400 Subject: fortran tests: non-gfortran compilers on Windows are best static libs collapsed get_relative_files_list_from_dir to a one-liner via pathlib.Path --- run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'run_tests.py') diff --git a/run_tests.py b/run_tests.py index f91ec85..6a42681 100755 --- a/run_tests.py +++ b/run_tests.py @@ -40,7 +40,7 @@ def guess_backend(backend, msbuild_exe: str): if backend is None: 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')) : + (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' -- cgit v1.1