diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-12-11 23:29:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 23:29:33 +0200 |
| commit | 17dd9e5bffd42c3ad6c2dff1f15639d6adf31e1c (patch) | |
| tree | 88eb97cee03e8ecffbd18b7f15e06d8ba038c03d /run_project_tests.py | |
| parent | c3d0b95a58695257cc40cbc9a51dfa6c7f172ec4 (diff) | |
| parent | f8aa17d8e62e05ed264a00a5e948b3e42aa68b30 (diff) | |
| download | meson-17dd9e5bffd42c3ad6c2dff1f15639d6adf31e1c.zip meson-17dd9e5bffd42c3ad6c2dff1f15639d6adf31e1c.tar.gz meson-17dd9e5bffd42c3ad6c2dff1f15639d6adf31e1c.tar.bz2 | |
Merge pull request #6207 from dcbaker/linker-option
Add a way to select the dynamic linker meson uses
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 b48b881..4f04fb2 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -621,14 +621,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]]: @@ -666,7 +665,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()), |