diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-25 15:41:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-25 15:41:37 -0400 |
| commit | ce9cd33f27e8605c2d7fc77c3c2f086b6ac530ae (patch) | |
| tree | 1237b06641a35362c060697705ab50ff014e3e1c /run_unittests.py | |
| parent | 1821598fbb856edc3cf87470171e85e8910a6f99 (diff) | |
| parent | 117f4ab8b5c7ff0bdaabe42b0945a0963d43e477 (diff) | |
| download | meson-ce9cd33f27e8605c2d7fc77c3c2f086b6ac530ae.zip meson-ce9cd33f27e8605c2d7fc77c3c2f086b6ac530ae.tar.gz meson-ce9cd33f27e8605c2d7fc77c3c2f086b6ac530ae.tar.bz2 | |
Merge pull request #1853 from astavale/split-compilers-file
Split compilers file
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/run_unittests.py b/run_unittests.py index 63462d8..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, [], []) @@ -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')] |