summaryrefslogtreecommitdiffstats
path: root/test/CPPDEFINES
diff options
context:
space:
mode:
authorAndrew Featherstone <andrew.featherstone@cantab.net>2014-07-29 21:05:47 (GMT)
committerAndrew Featherstone <andrew.featherstone@cantab.net>2014-07-29 21:05:47 (GMT)
commit28a2ad02e39ea773ae56aee9c3f855261303ebfe (patch)
treee52acdd54f85bffb4bd6b68e7521634d8faf28c5 /test/CPPDEFINES
parentbfb98081c448458cd05a7870eab45e654eac0a92 (diff)
downloadSCons-28a2ad02e39ea773ae56aee9c3f855261303ebfe.zip
SCons-28a2ad02e39ea773ae56aee9c3f855261303ebfe.tar.gz
SCons-28a2ad02e39ea773ae56aee9c3f855261303ebfe.tar.bz2
Corrects handling of appending dictionaries to CPPDEFINES. Amended a test case to demonstrate the issue.
Diffstat (limited to 'test/CPPDEFINES')
-rw-r--r--test/CPPDEFINES/append.py75
1 files changed, 37 insertions, 38 deletions
diff --git a/test/CPPDEFINES/append.py b/test/CPPDEFINES/append.py
index 2dacd8a..6e69d09 100644
--- a/test/CPPDEFINES/append.py
+++ b/test/CPPDEFINES/append.py
@@ -47,18 +47,17 @@ print env_1738_2.subst('$_CPPDEFFLAGS')
env_2300_1 = Environment(CPPDEFINES = 'foo', CPPDEFPREFIX='-D')
env_2300_1.Append(CPPDEFINES='bar')
print env_2300_1.subst('$_CPPDEFFLAGS')
-#env_2300_1.Object('test_2300_1', 'main.c')
env_2300_2 = Environment(CPPDEFINES = ['foo'], CPPDEFPREFIX='-D') # note the list
env_2300_2.Append(CPPDEFINES='bar')
print env_2300_2.subst('$_CPPDEFFLAGS')
-#env_2300_2.Object('test_2300_2', 'main.c')
# http://scons.tigris.org/issues/show_bug.cgi?id=1152
+# http://scons.tigris.org/issues/show_bug.cgi?id=2900
cases=[('string', 'FOO'),
('list', ['NAME1', 'NAME2']),
('list-of-2lists', [('NAME1','VAL1'), ['NAME2','VAL2']]),
- ('dict', {'NAME1' : 'VAL1', 'NAME2' : 'VAL2'})
+ ('dict', {'NAME1' : 'VAL1', 'NAME2' : 'VAL2', 'NAME3' : None})
]
for (t1, c1) in cases:
@@ -107,13 +106,13 @@ AppendUnique:
result=[('FOO',), ('NAME1', 'VAL1'), ('NAME2', 'VAL2')]
final=-DFOO -DNAME1=VAL1 -DNAME2=VAL2
==== Testing CPPDEFINES, appending a dict to a string
- orig = FOO, append = {'NAME2': 'VAL2', 'NAME1': 'VAL1'}
+ orig = FOO, append = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
Append:
- result=['FOO', {'NAME2': 'VAL2', 'NAME1': 'VAL1'}]
- final=-DFOO -DNAME2=VAL2 -DNAME1=VAL1
+ result=['FOO', {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}]
+ final=-DFOO -DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
AppendUnique:
- result=['FOO', ('NAME2', 'VAL2'), ('NAME1', 'VAL1')]
- final=-DFOO -DNAME2=VAL2 -DNAME1=VAL1
+ result=['FOO', ('NAME2', 'VAL2'), 'NAME3', ('NAME1', 'VAL1')]
+ final=-DFOO -DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
==== Testing CPPDEFINES, appending a string to a list
orig = ['NAME1', 'NAME2'], append = FOO
Append:
@@ -139,13 +138,13 @@ AppendUnique:
result=[('NAME1',), ('NAME2',), ('NAME1', 'VAL1'), ('NAME2', 'VAL2')]
final=-DNAME1 -DNAME2 -DNAME1=VAL1 -DNAME2=VAL2
==== Testing CPPDEFINES, appending a dict to a list
- orig = ['NAME1', 'NAME2'], append = {'NAME2': 'VAL2', 'NAME1': 'VAL1'}
+ orig = ['NAME1', 'NAME2'], append = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
Append:
- result=['NAME1', 'NAME2', {'NAME2': 'VAL2', 'NAME1': 'VAL1'}]
- final=-DNAME1 -DNAME2 -DNAME2=VAL2 -DNAME1=VAL1
+ result=['NAME1', 'NAME2', {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}]
+ final=-DNAME1 -DNAME2 -DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
AppendUnique:
- result=[('NAME1',), ('NAME2',), ('NAME2', 'VAL2'), ('NAME1', 'VAL1')]
- final=-DNAME1 -DNAME2 -DNAME2=VAL2 -DNAME1=VAL1
+ result=[('NAME1',), ('NAME2',), ('NAME2', 'VAL2'), ('NAME3',), ('NAME1', 'VAL1')]
+ final=-DNAME1 -DNAME2 -DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
==== Testing CPPDEFINES, appending a string to a list-of-2lists
orig = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']], append = FOO
Append:
@@ -171,45 +170,45 @@ AppendUnique:
result=[('NAME1', 'VAL1'), ('NAME2', 'VAL2')]
final=-DNAME1=VAL1 -DNAME2=VAL2
==== Testing CPPDEFINES, appending a dict to a list-of-2lists
- orig = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']], append = {'NAME2': 'VAL2', 'NAME1': 'VAL1'}
+ orig = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']], append = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
Append:
- result=[('NAME1', 'VAL1'), ['NAME2', 'VAL2'], {'NAME2': 'VAL2', 'NAME1': 'VAL1'}]
- final=-DNAME1=VAL1 -DNAME2=VAL2 -DNAME2=VAL2 -DNAME1=VAL1
+ result=[('NAME1', 'VAL1'), ['NAME2', 'VAL2'], {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}]
+ final=-DNAME1=VAL1 -DNAME2=VAL2 -DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
AppendUnique:
- result=[('NAME2', 'VAL2'), ('NAME1', 'VAL1')]
- final=-DNAME2=VAL2 -DNAME1=VAL1
+ result=[('NAME2', 'VAL2'), ('NAME3',), ('NAME1', 'VAL1')]
+ final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
==== Testing CPPDEFINES, appending a string to a dict
- orig = {'NAME2': 'VAL2', 'NAME1': 'VAL1'}, append = FOO
+ orig = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}, append = FOO
Append:
- result={'FOO': None, 'NAME2': 'VAL2', 'NAME1': 'VAL1'}
- final=-DFOO -DNAME1=VAL1 -DNAME2=VAL2
+ result={'FOO': None, 'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
+ final=-DFOO -DNAME1=VAL1 -DNAME2=VAL2 -DNAME3
AppendUnique:
- result=[('NAME2', 'VAL2'), ('NAME1', 'VAL1'), 'FOO']
- final=-DNAME2=VAL2 -DNAME1=VAL1 -DFOO
+ result=[('NAME2', 'VAL2'), ('NAME3',), ('NAME1', 'VAL1'), 'FOO']
+ final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1 -DFOO
==== Testing CPPDEFINES, appending a list to a dict
- orig = {'NAME2': 'VAL2', 'NAME1': 'VAL1'}, append = ['NAME1', 'NAME2']
+ orig = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}, append = ['NAME1', 'NAME2']
Append:
- result=[('NAME2', 'VAL2'), ('NAME1', 'VAL1'), 'NAME1', 'NAME2']
- final=-DNAME2=VAL2 -DNAME1=VAL1 -DNAME1 -DNAME2
+ result=[('NAME2', 'VAL2'), ('NAME3',), ('NAME1', 'VAL1'), 'NAME1', 'NAME2']
+ final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1 -DNAME1 -DNAME2
AppendUnique:
- result=[('NAME2', 'VAL2'), ('NAME1', 'VAL1'), ('NAME1',), ('NAME2',)]
- final=-DNAME2=VAL2 -DNAME1=VAL1 -DNAME1 -DNAME2
+ result=[('NAME2', 'VAL2'), ('NAME3',), ('NAME1', 'VAL1'), ('NAME1',), ('NAME2',)]
+ final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1 -DNAME1 -DNAME2
==== Testing CPPDEFINES, appending a list-of-2lists to a dict
- orig = {'NAME2': 'VAL2', 'NAME1': 'VAL1'}, append = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
+ orig = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}, append = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
Append:
- result=[('NAME2', 'VAL2'), ('NAME1', 'VAL1'), ('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
- final=-DNAME2=VAL2 -DNAME1=VAL1 -DNAME1=VAL1 -DNAME2=VAL2
+ result=[('NAME2', 'VAL2'), ('NAME3',), ('NAME1', 'VAL1'), ('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
+ final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1 -DNAME1=VAL1 -DNAME2=VAL2
AppendUnique:
- result=[('NAME2', 'VAL2'), ('NAME1', 'VAL1')]
- final=-DNAME2=VAL2 -DNAME1=VAL1
+ result=[('NAME2', 'VAL2'), ('NAME3',), ('NAME1', 'VAL1')]
+ final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
==== Testing CPPDEFINES, appending a dict to a dict
- orig = {'NAME2': 'VAL2', 'NAME1': 'VAL1'}, append = {'NAME2': 'VAL2', 'NAME1': 'VAL1'}
+ orig = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}, append = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
Append:
- result={'NAME2': 'VAL2', 'NAME1': 'VAL1'}
- final=-DNAME1=VAL1 -DNAME2=VAL2
+ result={'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
+ final=-DNAME1=VAL1 -DNAME2=VAL2 -DNAME3
AppendUnique:
- result={'NAME2': 'VAL2', 'NAME1': 'VAL1'}
- final=-DNAME1=VAL1 -DNAME2=VAL2
+ result={'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
+ final=-DNAME1=VAL1 -DNAME2=VAL2 -DNAME3
"""
build_output="scons: `.' is up to date.\n"