From e5559903b3857a333c6cbc88b44d6759c293e5df Mon Sep 17 00:00:00 2001 From: Alistair Thomas Date: Wed, 21 Jun 2017 19:02:29 +0100 Subject: Split linkers out from compilers.py --- run_unittests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'run_unittests.py') diff --git a/run_unittests.py b/run_unittests.py index 63462d8..93a43ae 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -701,7 +701,7 @@ class AllPlatformTests(BasePlatformTests): static_linker = env.detect_static_linker(cc) if is_windows(): raise unittest.SkipTest('https://github.com/mesonbuild/meson/issues/1526') - if not isinstance(static_linker, mesonbuild.compilers.ArLinker): + if not isinstance(static_linker, mesonbuild.linkers.ArLinker): raise unittest.SkipTest('static linker is not `ar`') # Configure self.init(testdir) @@ -936,8 +936,8 @@ class AllPlatformTests(BasePlatformTests): clang = mesonbuild.compilers.ClangCompiler intel = mesonbuild.compilers.IntelCompiler msvc = mesonbuild.compilers.VisualStudioCCompiler - ar = mesonbuild.compilers.ArLinker - lib = mesonbuild.compilers.VisualStudioLinker + ar = mesonbuild.linkers.ArLinker + lib = mesonbuild.linkers.VisualStudioLinker langs = [('c', 'CC'), ('cpp', 'CXX')] if not is_windows(): langs += [('objc', 'OBJC'), ('objcpp', 'OBJCXX')] -- cgit v1.1 From 117f4ab8b5c7ff0bdaabe42b0945a0963d43e477 Mon Sep 17 00:00:00 2001 From: Alistair Thomas Date: Fri, 23 Jun 2017 00:42:41 +0100 Subject: Split out languages from compilers.py --- run_unittests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'run_unittests.py') diff --git a/run_unittests.py b/run_unittests.py index 93a43ae..6a50302 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -109,7 +109,7 @@ class InternalTests(unittest.TestCase): def test_compiler_args_class(self): cargsfunc = mesonbuild.compilers.CompilerArgs - c = mesonbuild.environment.CCompiler([], 'fake', False) + c = mesonbuild.compilers.CCompiler([], 'fake', False) # Test that bad initialization fails self.assertRaises(TypeError, cargsfunc, []) self.assertRaises(TypeError, cargsfunc, [], []) -- cgit v1.1