diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-09-30 14:46:10 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-10-25 17:24:56 -0400 |
| commit | 2961adb8c89fa8ccfbc8e24cd9f1115bd3abeee1 (patch) | |
| tree | a52ebb2666ba207caf94ca38b4e111390a6124e1 /unittests | |
| parent | b0e2d00acd67e13ac3478cb7f00a080d702bb8d7 (diff) | |
| download | meson-2961adb8c89fa8ccfbc8e24cd9f1115bd3abeee1.zip meson-2961adb8c89fa8ccfbc8e24cd9f1115bd3abeee1.tar.gz meson-2961adb8c89fa8ccfbc8e24cd9f1115bd3abeee1.tar.bz2 | |
Compilers: Keep ccache and exelist separated
Only combine them in the Compiler base class, this will make easier to
run compiler without ccache.
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/internaltests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unittests/internaltests.py b/unittests/internaltests.py index e37eb55..29d4bb3 100644 --- a/unittests/internaltests.py +++ b/unittests/internaltests.py @@ -117,7 +117,7 @@ class InternalTests(unittest.TestCase): stat.S_IRGRP | stat.S_IXGRP) def test_compiler_args_class_none_flush(self): - cc = ClangCCompiler([], 'fake', MachineChoice.HOST, False, mock.Mock()) + cc = ClangCCompiler([], [], 'fake', MachineChoice.HOST, False, mock.Mock()) a = cc.compiler_args(['-I.']) #first we are checking if the tree construction deduplicates the correct -I argument a += ['-I..'] @@ -141,7 +141,7 @@ class InternalTests(unittest.TestCase): self.assertEqual(a, ['-Ifirst', '-Isecond', '-Ithird']) def test_compiler_args_class_clike(self): - cc = ClangCCompiler([], 'fake', MachineChoice.HOST, False, mock.Mock()) + cc = ClangCCompiler([], [], 'fake', MachineChoice.HOST, False, mock.Mock()) # Test that empty initialization works a = cc.compiler_args() self.assertEqual(a, []) @@ -223,7 +223,7 @@ class InternalTests(unittest.TestCase): def test_compiler_args_class_gnuld(self): ## Test --start/end-group linker = mesonbuild.linkers.GnuBFDDynamicLinker([], MachineChoice.HOST, '-Wl,', []) - gcc = GnuCCompiler([], 'fake', False, MachineChoice.HOST, mock.Mock(), linker=linker) + gcc = GnuCCompiler([], [], 'fake', False, MachineChoice.HOST, mock.Mock(), linker=linker) ## Ensure that the fake compiler is never called by overriding the relevant function gcc.get_default_include_dirs = lambda: ['/usr/include', '/usr/share/include', '/usr/local/include'] ## Test that 'direct' append and extend works @@ -251,7 +251,7 @@ class InternalTests(unittest.TestCase): def test_compiler_args_remove_system(self): ## Test --start/end-group linker = mesonbuild.linkers.GnuBFDDynamicLinker([], MachineChoice.HOST, '-Wl,', []) - gcc = GnuCCompiler([], 'fake', False, MachineChoice.HOST, mock.Mock(), linker=linker) + gcc = GnuCCompiler([], [], 'fake', False, MachineChoice.HOST, mock.Mock(), linker=linker) ## Ensure that the fake compiler is never called by overriding the relevant function gcc.get_default_include_dirs = lambda: ['/usr/include', '/usr/share/include', '/usr/local/include'] ## Test that 'direct' append and extend works |