From f6b0425576640e1613f64503951c7c604b868947 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 20 Mar 2020 12:57:24 -0400 Subject: Fix linker evn var tests Just because we are on windows doesn't mean we can use `link`. This ought to be done better, but this will do for now. --- run_unittests.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'run_unittests.py') diff --git a/run_unittests.py b/run_unittests.py index 957e1b1..962ab5d 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -4989,14 +4989,24 @@ class WindowsTests(BasePlatformTests): self.assertEqual(comp.linker.id, expected) def test_link_environment_variable_lld_link(self): + env = get_fake_env() + comp = getattr(env, 'detect_c_compiler')(MachineChoice.HOST) + if isinstance(comp, mesonbuild.compilers.GnuLikeCompiler): + raise unittest.SkipTest('GCC cannot be used with link compatible linkers.') self._check_ld('lld-link', 'c', 'lld-link') def test_link_environment_variable_link(self): - if shutil.which('gcc'): - raise unittest.SkipTest('GCC can not used with link.exe.') + env = get_fake_env() + comp = getattr(env, 'detect_c_compiler')(MachineChoice.HOST) + if isinstance(comp, mesonbuild.compilers.GnuLikeCompiler): + raise unittest.SkipTest('GCC cannot be used with link compatible linkers.') self._check_ld('link', 'c', 'link') def test_link_environment_variable_optlink(self): + env = get_fake_env() + comp = getattr(env, 'detect_c_compiler')(MachineChoice.HOST) + if isinstance(comp, mesonbuild.compilers.GnuLikeCompiler): + raise unittest.SkipTest('GCC cannot be used with link compatible linkers.') self._check_ld('optlink', 'c', 'optlink') @skip_if_not_language('rust') -- cgit v1.1