From 0bb1e949e2c8dde6533b21b8d3dbb2b8a7facc64 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 12 Mar 2020 09:17:23 -0700 Subject: run_unittests: Use skip_if_not_language for linker tests A couple used checks for specific compiler binaries, but those might not be accurate for cross compiling. All the languages other than C and C++ (which we basically always assume we have) should have a skip_if_not_lang check. --- run_unittests.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/run_unittests.py b/run_unittests.py index f867f1c35..725906bcb 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -4990,6 +4990,7 @@ class WindowsTests(BasePlatformTests): def test_link_environment_variable_optlink(self): self._check_ld('optlink', 'c', 'optlink') + @skip_if_not_language('rust') def test_link_environment_variable_rust(self): self._check_ld('link', 'rust', 'link') @@ -6342,20 +6343,22 @@ c = ['{0}'] def test_ld_environment_variable_lld(self): self._check_ld('ld.lld', 'lld', 'c', 'ld.lld') - @skipIfNoExecutable('rustc') + @skip_if_not_language('rust') def test_ld_environment_variable_rust(self): self._check_ld('ld.gold', 'gold', 'rust', 'ld.gold') def test_ld_environment_variable_cpp(self): self._check_ld('ld.gold', 'gold', 'cpp', 'ld.gold') + @skip_if_not_language('objc') def test_ld_environment_variable_objc(self): self._check_ld('ld.gold', 'gold', 'objc', 'ld.gold') + @skip_if_not_language('objcpp') def test_ld_environment_variable_objcpp(self): self._check_ld('ld.gold', 'gold', 'objcpp', 'ld.gold') - @skipIfNoExecutable('gfortran') + @skip_if_not_language('fortran') def test_ld_environment_variable_fortran(self): self._check_ld('ld.gold', 'gold', 'fortran', 'ld.gold') -- cgit v1.2.3