diff options
| author | Steven Knight <knight@baldmt.com> | 2004-08-05 20:00:20 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-08-05 20:00:20 (GMT) |
| commit | 42629fe85a87b728d01c67e65bdbfde310744c63 (patch) | |
| tree | f96bca18fdb063488c45f340ecf9a8d02902071f /src/engine/SCons/ActionTests.py | |
| parent | d7289a48cb622e56d940fc21c67ee6947a4d5ae1 (diff) | |
| download | SCons-42629fe85a87b728d01c67e65bdbfde310744c63.zip SCons-42629fe85a87b728d01c67e65bdbfde310744c63.tar.gz SCons-42629fe85a87b728d01c67e65bdbfde310744c63.tar.bz2 | |
Return lists of Nodes from all builders, not single Nodes when there's only one.
Diffstat (limited to 'src/engine/SCons/ActionTests.py')
| -rw-r--r-- | src/engine/SCons/ActionTests.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py index 9a89623..4c1649c 100644 --- a/src/engine/SCons/ActionTests.py +++ b/src/engine/SCons/ActionTests.py @@ -374,7 +374,7 @@ class ActionBaseTestCase(unittest.TestCase): result = a("out", "in", env) assert result == 7, result s = sio.getvalue() - assert s == 'execfunc("out", "in")\n', s + assert s == 'execfunc(["out"], ["in"])\n', s SCons.Action.execute_actions = 0 @@ -383,7 +383,7 @@ class ActionBaseTestCase(unittest.TestCase): result = a("out", "in", env) assert result == 0, result s = sio.getvalue() - assert s == 'execfunc("out", "in")\n', s + assert s == 'execfunc(["out"], ["in"])\n', s SCons.Action.print_actions_presub = 1 @@ -392,14 +392,14 @@ class ActionBaseTestCase(unittest.TestCase): result = a("out", "in", env) assert result == 0, result s = sio.getvalue() - assert s == 'execfunc("out", "in")\n', s + assert s == 'execfunc(["out"], ["in"])\n', s sio = StringIO.StringIO() sys.stdout = sio result = a("out", "in", env, presub=1) assert result == 0, result s = sio.getvalue() - assert s == 'Building out with action(s):\n execfunc(env, target, source)\nexecfunc("out", "in")\n', s + assert s == 'Building out with action(s):\n execfunc(env, target, source)\nexecfunc(["out"], ["in"])\n', s a2 = SCons.Action.Action(execfunc) @@ -408,14 +408,14 @@ class ActionBaseTestCase(unittest.TestCase): result = a2("out", "in", env) assert result == 0, result s = sio.getvalue() - assert s == 'Building out with action(s):\n execfunc(env, target, source)\nexecfunc("out", "in")\n', s + assert s == 'Building out with action(s):\n execfunc(env, target, source)\nexecfunc(["out"], ["in"])\n', s sio = StringIO.StringIO() sys.stdout = sio result = a2("out", "in", env, presub=0) assert result == 0, result s = sio.getvalue() - assert s == 'execfunc("out", "in")\n', s + assert s == 'execfunc(["out"], ["in"])\n', s sio = StringIO.StringIO() sys.stdout = sio |