diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-08-14 12:31:04 -0700 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-08-15 00:31:18 +0300 |
commit | 75688240cfca7eed08c2754daa784c9bd1a70a73 (patch) | |
tree | b270bd496ba4bd9cb78580ca8746ab4003b52b5e | |
parent | 9ab12ca85ed03c314e5ff41e3e87924c87602b1c (diff) | |
download | meson-75688240cfca7eed08c2754daa784c9bd1a70a73.zip meson-75688240cfca7eed08c2754daa784c9bd1a70a73.tar.gz meson-75688240cfca7eed08c2754daa784c9bd1a70a73.tar.bz2 |
Disable vs2017 + 32bit Rust combo as it is broken.
-rwxr-xr-x | run_project_tests.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 2c1e9d0..45cd266 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -1006,13 +1006,22 @@ def has_broken_rustc() -> bool: mesonlib.windows_proof_rmtree(dirname.as_posix()) return pc.returncode != 0 +def has_broken_compiler_combination() -> bool: + # Rust and vs2017 do not work together. But only with 32 bits. + if os.environ['VisualStudioVersion'] == '15.0' and os.environ['Platform'] == 'x86': + return True + return False + def should_skip_rust(backend: Backend) -> bool: if not shutil.which('rustc'): return True if backend is not Backend.ninja: return True - if mesonlib.is_windows() and has_broken_rustc(): - return True + if mesonlib.is_windows(): + if has_broken_rustc(): + return True + if has_broken_compiler_combination(): + return True return False def detect_tests_to_run(only: T.Dict[str, T.List[str]], use_tmp: bool) -> T.List[T.Tuple[str, T.List[TestDef], bool]]: |