diff options
Diffstat (limited to 'test/CPPDEFINES/fixture/SConstruct-Prepend')
| -rw-r--r-- | test/CPPDEFINES/fixture/SConstruct-Prepend | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/test/CPPDEFINES/fixture/SConstruct-Prepend b/test/CPPDEFINES/fixture/SConstruct-Prepend index 4628ea46a..7fd4d8475 100644 --- a/test/CPPDEFINES/fixture/SConstruct-Prepend +++ b/test/CPPDEFINES/fixture/SConstruct-Prepend @@ -15,7 +15,7 @@ env_2300_2 = Environment(CPPDEFINES=['foo'], CPPDEFPREFIX='-D') # note the list env_2300_2.Prepend(CPPDEFINES='bar') print(env_2300_2.subst('$_CPPDEFFLAGS')) -# an initial space-separated string will be split, but not a string in a list +# An initial space-separated string will be split, but not a string in a list. env_multi = Environment(CPPDEFPREFIX='-D') env_multi['CPPDEFINES'] = "foo bar" env_multi.Prepend(CPPDEFINES="baz") @@ -28,20 +28,27 @@ env_multi = Environment(CPPDEFPREFIX='-D') env_multi['CPPDEFINES'] = "foo" env_multi.Prepend(CPPDEFINES=["bar baz"]) print(env_multi.subst('$_CPPDEFFLAGS')) +env_multi = Environment(CPPDEFPREFIX='-D') +env_multi['CPPDEFINES'] = "foo" +env_multi.Prepend(CPPDEFINES="bar baz") +print(env_multi.subst('$_CPPDEFFLAGS')) -# check that PrependUnique(..., delete_existing=True) works as expected -# each addition is in different but matching form, and different order, +# Check that AppendUnique(..., delete_existing=True) works as expected. +# Each addition is in different but matching form, and different order # so we expect a reordered list, but with the same macro defines. env_multi = Environment(CPPDEFPREFIX='-D') env_multi.Prepend(CPPDEFINES=["Macro1=Value1", ("Macro2", "Value2"), {"Macro3": "Value3"}]) env_multi.PrependUnique(CPPDEFINES="Macro2=Value2", delete_existing=True) +env_multi.AppendUnique(CPPDEFINES=[("Macro4", None)], delete_existing=True) env_multi.PrependUnique(CPPDEFINES=[("Macro3", "Value3")], delete_existing=True) env_multi.PrependUnique(CPPDEFINES={"Macro1": "Value1"}, delete_existing=True) print(env_multi.subst('$_CPPDEFFLAGS')) -# a lone tuple +# A lone tuple handled differently than a lone list. env_tuple = Environment(CPPDEFPREFIX='-D', CPPDEFINES=("Macro1", "Value1")) print(env_tuple.subst('$_CPPDEFFLAGS')) +env_multi = Environment(CPPDEFPREFIX='-D', CPPDEFINES=["Macro1", "Value1"]) +print(env_multi.subst('$_CPPDEFFLAGS')) # https://github.com/SCons/scons/issues/1152 # https://github.com/SCons/scons/issues/2900 @@ -67,11 +74,11 @@ class OrderedPrintingDict(OrderedDict): cases = [ ('string', 'FOO'), ('valuestring', 'NAME1=VAL1'), - ('list', ['NAME1', 'NAME2']), - ('tuple', ('NAME1', 'NAME2')), + ('list', ['NAME1', 'NAME2', 'NAME3']), + ('tuple', ('NAME1', 'VAL1')), ('list-of-2lists', [('NAME1', 'VAL1'), ['NAME2', 'VAL2']]), ( - 'dict', + 'dict', # intentionally not sorted by key OrderedPrintingDict([('NAME2', 'VAL2'), ('NAME3', None), ('NAME1', 'VAL1')]), ), ] |