Skip to content

Commit

Permalink
Revert "Disable Rust + clangcl."
Browse files Browse the repository at this point in the history
This reverts commit 6c55fc5
  • Loading branch information
nirbheek authored and dcbaker committed Aug 18, 2021
1 parent 339c768 commit 1799658
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions run_project_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]]:
Expand Down

0 comments on commit 1799658

Please sign in to comment.