@ -241,7 +241,7 @@ class InternalTests(unittest.TestCase):
gcc . get_default_include_dirs = lambda : [ ' /usr/include ' , ' /usr/share/include ' , ' /usr/local/include ' ]
gcc . get_default_include_dirs = lambda : [ ' /usr/include ' , ' /usr/share/include ' , ' /usr/local/include ' ]
## Test that 'direct' append and extend works
## Test that 'direct' append and extend works
l = gcc . compiler_args ( [ ' -Lfoodir ' , ' -lfoo ' ] )
l = gcc . compiler_args ( [ ' -Lfoodir ' , ' -lfoo ' ] )
self . assertEqual ( l . to_native ( copy = True ) , [ ' -Lfoodir ' , ' -Wl,--start-group ' , ' - lfoo ' , ' -Wl,--end-group ' ] )
self . assertEqual ( l . to_native ( copy = True ) , [ ' -Lfoodir ' , ' -lfoo ' ] )
# Direct-adding a library and a libpath appends both correctly
# Direct-adding a library and a libpath appends both correctly
l . extend_direct ( [ ' -Lbardir ' , ' -lbar ' ] )
l . extend_direct ( [ ' -Lbardir ' , ' -lbar ' ] )
self . assertEqual ( l . to_native ( copy = True ) , [ ' -Lfoodir ' , ' -Wl,--start-group ' , ' -lfoo ' , ' -Lbardir ' , ' -lbar ' , ' -Wl,--end-group ' ] )
self . assertEqual ( l . to_native ( copy = True ) , [ ' -Lfoodir ' , ' -Wl,--start-group ' , ' -lfoo ' , ' -Lbardir ' , ' -lbar ' , ' -Wl,--end-group ' ] )
@ -269,10 +269,10 @@ class InternalTests(unittest.TestCase):
gcc . get_default_include_dirs = lambda : [ ' /usr/include ' , ' /usr/share/include ' , ' /usr/local/include ' ]
gcc . get_default_include_dirs = lambda : [ ' /usr/include ' , ' /usr/share/include ' , ' /usr/local/include ' ]
## Test that 'direct' append and extend works
## Test that 'direct' append and extend works
l = gcc . compiler_args ( [ ' -Lfoodir ' , ' -lfoo ' ] )
l = gcc . compiler_args ( [ ' -Lfoodir ' , ' -lfoo ' ] )
self . assertEqual ( l . to_native ( copy = True ) , [ ' -Lfoodir ' , ' -Wl,--start-group ' , ' - lfoo ' , ' -Wl,--end-group ' ] )
self . assertEqual ( l . to_native ( copy = True ) , [ ' -Lfoodir ' , ' -lfoo ' ] )
## Test that to_native removes all system includes
## Test that to_native removes all system includes
l + = [ ' -isystem/usr/include ' , ' -isystem=/usr/share/include ' , ' -DSOMETHING_IMPORTANT=1 ' , ' -isystem ' , ' /usr/local/include ' ]
l + = [ ' -isystem/usr/include ' , ' -isystem=/usr/share/include ' , ' -DSOMETHING_IMPORTANT=1 ' , ' -isystem ' , ' /usr/local/include ' ]
self . assertEqual ( l . to_native ( copy = True ) , [ ' -Lfoodir ' , ' -Wl,--start-group ' , ' - lfoo ' , ' -Wl,--end-group ' , ' -DSOMETHING_IMPORTANT=1 ' ] )
self . assertEqual ( l . to_native ( copy = True ) , [ ' -Lfoodir ' , ' -lfoo ' , ' -DSOMETHING_IMPORTANT=1 ' ] )
def test_string_templates_substitution ( self ) :
def test_string_templates_substitution ( self ) :
dictfunc = mesonbuild . mesonlib . get_filenames_templates_dict
dictfunc = mesonbuild . mesonlib . get_filenames_templates_dict