diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-08-07 22:45:39 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-08-07 22:45:39 (GMT) |
| commit | 8ca7e7567aa44a8c0f74d00e78503cd94a8794b0 (patch) | |
| tree | 74a1221558c955a1fa6beedb16b295e3e300dde3 /src/engine/SCons/ActionTests.py | |
| parent | 4936d53c1f92e522f147e846ea0860421098ffea (diff) | |
| parent | 98c4c1c7b820bbb42384584bc0d95c7849f71503 (diff) | |
| download | SCons-8ca7e7567aa44a8c0f74d00e78503cd94a8794b0.zip SCons-8ca7e7567aa44a8c0f74d00e78503cd94a8794b0.tar.gz SCons-8ca7e7567aa44a8c0f74d00e78503cd94a8794b0.tar.bz2 | |
Merged in thosrtanner/trt-scons-sig-suppress (pull request #390)
Diffstat (limited to 'src/engine/SCons/ActionTests.py')
| -rw-r--r-- | src/engine/SCons/ActionTests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py index 9d856c9..2398c10 100644 --- a/src/engine/SCons/ActionTests.py +++ b/src/engine/SCons/ActionTests.py @@ -1241,8 +1241,8 @@ class CommandActionTestCase(unittest.TestCase): (env["foo"], env["bar"]) # The number 1 is there to make sure all args get converted to strings. - a = SCons.Action.CommandAction(["|", "$(", "$foo", "|", "$bar", - "$)", "|", "$baz", 1]) + a = SCons.Action.CommandAction(["|", "$(", "$foo", "|", "$(", "$bar", + "$)", "stuff", "$)", "|", "$baz", 1]) c = a.get_contents(target=[], source=[], env=Environment(foo = 'FFF', bar = 'BBB', baz = CmdGen)) @@ -1257,7 +1257,7 @@ class CommandActionTestCase(unittest.TestCase): c = a.get_contents(target=DummyNode('ttt'), source = DummyNode('sss'), env=SpecialEnvironment(foo = 'GGG', bar = 'CCC', baz = 'ZZZ')) - assert c == b'subst_target_source: | $( $foo | $bar $) | $baz 1', c + assert c == b'subst_target_source: | $( $foo | $( $bar $) stuff $) | $baz 1', c # We've discussed using the real target and source names in a # CommandAction's signature contents. This would have have the |