diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-12-02 15:22:59 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-12-03 13:08:42 -0800 |
| commit | 39efd977141e9e4fb923d631a7006c130d5ae769 (patch) | |
| tree | 202bb81988f7b37f32915e6924eb2887bf570c02 /run_project_tests.py | |
| parent | 75c1874bb3adbe96ba2a6cab64d471e27ca712c7 (diff) | |
| download | meson-39efd977141e9e4fb923d631a7006c130d5ae769.zip meson-39efd977141e9e4fb923d631a7006c130d5ae769.tar.gz meson-39efd977141e9e4fb923d631a7006c130d5ae769.tar.bz2 | |
run_project_tests: Fix skip rust
which expects an argument of backend, but isn't getting one.
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index dbda839..0784d34 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -616,14 +616,13 @@ def has_broken_rustc() -> bool: mesonlib.windows_proof_rmtree(dirname) return pc.returncode != 0 -def should_skip_rust() -> bool: +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(): - if has_broken_rustc(): - return True + if mesonlib.is_windows() and has_broken_rustc(): + return True return False def detect_tests_to_run(only: typing.List[str]) -> typing.List[typing.Tuple[str, typing.List[Path], bool]]: @@ -659,7 +658,7 @@ def detect_tests_to_run(only: typing.List[str]) -> typing.List[typing.Tuple[str, ('java', 'java', backend is not Backend.ninja or mesonlib.is_osx() or not have_java()), ('C#', 'csharp', skip_csharp(backend)), ('vala', 'vala', backend is not Backend.ninja or not shutil.which(os.environ.get('VALAC', 'valac'))), - ('rust', 'rust', should_skip_rust()), + ('rust', 'rust', should_skip_rust(backend)), ('d', 'd', backend is not Backend.ninja or not have_d_compiler()), ('objective c', 'objc', backend not in (Backend.ninja, Backend.xcode) or not have_objc_compiler()), ('objective c++', 'objcpp', backend not in (Backend.ninja, Backend.xcode) or not have_objcpp_compiler()), |