aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-06-11 12:06:29 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-06-22 12:06:10 -0700
commit9d0ad66c29fccd2ff72c2b40da02cdb2b03ccba6 (patch)
treee19e88210892ada6d44282f9ce5a37fa33957a82 /run_unittests.py
parent386721f7fd3261ba15004a7f527e9db83e216ace (diff)
downloadmeson-9d0ad66c29fccd2ff72c2b40da02cdb2b03ccba6.zip
meson-9d0ad66c29fccd2ff72c2b40da02cdb2b03ccba6.tar.gz
meson-9d0ad66c29fccd2ff72c2b40da02cdb2b03ccba6.tar.bz2
compilers: Split CompilerArgs into a separate module
I've also moved this out of the compilers pacakge because we're soon going to need it in linkers, and that creates some serious spagetti
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/run_unittests.py b/run_unittests.py
index b663e83..b1ad965 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -358,7 +358,7 @@ class InternalTests(unittest.TestCase):
stat.S_IRGRP | stat.S_IXGRP)
def test_compiler_args_class_none_flush(self):
- cargsfunc = mesonbuild.compilers.CompilerArgs
+ cargsfunc = mesonbuild.arglist.CompilerArgs
cc = mesonbuild.compilers.CCompiler([], 'fake', False, MachineChoice.HOST, mock.Mock())
a = cargsfunc(cc, ['-I.'])
#first we are checking if the tree construction deduplicates the correct -I argument
@@ -377,7 +377,7 @@ class InternalTests(unittest.TestCase):
def test_compiler_args_class(self):
- cargsfunc = mesonbuild.compilers.CompilerArgs
+ cargsfunc = mesonbuild.arglist.CompilerArgs
cc = mesonbuild.compilers.CCompiler([], 'fake', False, MachineChoice.HOST, mock.Mock())
# Test that empty initialization works
a = cargsfunc(cc)
@@ -458,7 +458,7 @@ class InternalTests(unittest.TestCase):
self.assertEqual(l, ['-Lfoodir', '-lfoo', '-Lbardir', '-lbar', '-lbar', '/libbaz.a'])
def test_compiler_args_class_gnuld(self):
- cargsfunc = mesonbuild.compilers.CompilerArgs
+ cargsfunc = mesonbuild.arglist.CompilerArgs
## Test --start/end-group
linker = mesonbuild.linkers.GnuDynamicLinker([], MachineChoice.HOST, 'fake', '-Wl,', [])
gcc = mesonbuild.compilers.GnuCCompiler([], 'fake', False, MachineChoice.HOST, mock.Mock(), linker=linker)
@@ -487,7 +487,7 @@ class InternalTests(unittest.TestCase):
self.assertEqual(l.to_native(copy=True), ['-Lfoo', '-Lfoodir', '-Wl,--start-group', '-lfoo', '-Lbardir', '-lbar', '-lbar', '/libbaz.a', '-Wl,--export-dynamic', '-Wl,-ldl', '-Wl,--end-group'])
def test_compiler_args_remove_system(self):
- cargsfunc = mesonbuild.compilers.CompilerArgs
+ cargsfunc = mesonbuild.arglist.CompilerArgs
## Test --start/end-group
linker = mesonbuild.linkers.GnuDynamicLinker([], MachineChoice.HOST, 'fake', '-Wl,', [])
gcc = mesonbuild.compilers.GnuCCompiler([], 'fake', False, MachineChoice.HOST, mock.Mock(), linker=linker)
@@ -4764,7 +4764,7 @@ recommended as it is not supported on some platforms''')
out = re.sub(r'(^ +| +$)', '', out, flags=re.MULTILINE) # strip lines
out = re.sub(r'(^\n)', '', out, flags=re.MULTILINE) # remove empty lines
return out
-
+
def clean_dir_arguments(text):
# Remove platform specific defaults
args = [