diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2021-08-18 04:11:15 +0530 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-08-17 19:58:23 -0700 |
| commit | 1799658614944a7cb4ead5c4ce9de62d61c59329 (patch) | |
| tree | e2d778a31f4280a0facfe19a879c90b1dd6ae469 | |
| parent | 339c768862422baaccc74ee7bc11b48b6994807c (diff) | |
| download | meson-1799658614944a7cb4ead5c4ce9de62d61c59329.zip meson-1799658614944a7cb4ead5c4ce9de62d61c59329.tar.gz meson-1799658614944a7cb4ead5c4ce9de62d61c59329.tar.bz2 | |
Revert "Disable Rust + clangcl."
This reverts commit 6c55fc5cb0f6f363d5221c9bd0c1fd1fc6f90f4a
| -rwxr-xr-x | run_project_tests.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index e1de2e3..e8e9e67 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -1006,12 +1006,6 @@ def has_broken_rustc() -> bool: mesonlib.windows_proof_rmtree(dirname.as_posix()) return pc.returncode != 0 -def has_broken_compiler_combination() -> bool: - # Clang-cl fails with Rust on the CI - if shutil.which('cl') is None and shutil.which('clang-cl'): - return True - return False - def should_skip_rust(backend: Backend) -> bool: if not shutil.which('rustc'): return True @@ -1020,8 +1014,6 @@ def should_skip_rust(backend: Backend) -> bool: 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]]: |