Refactor Action/Executor interaction. (Kevin Quick)

1 files changed, 38 insertions, 30 deletions

diff --git a/test/option--debug.py b/test/option--debug.py
index e3d9960..7a80647 100644
--- a/test/option--debug.py
+++ b/test/option--debug.py
@@ -295,72 +295,80 @@ test.write('file17.in', "file17.in\n")
 test.write('file18.in', "file18.in\n")
 
 expect = """\
-Building file01.out with action(s):
+Building file01.out with action:
   $PYTHON cat.py $SOURCES $TARGET
 __PYTHON__ cat.py file01.in file01.out
-Building file02.out with action(s):
+Building file02.out with action:
   $PYTHON cat.py $SOURCES $TARGET
 __PYTHON__ cat.py file02.in file02.out
-Building file03.out with action(s):
+Building file03.out with action:
   $PYTHON cat.py $SOURCES temp
-  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py file03.in temp
+Building file03.out with action:
+  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py temp file03.out
-Building file04.out with action(s):
+Building file04.out with action:
   $PYTHON cat.py $SOURCES temp
-  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py file04.in temp
+Building file04.out with action:
+  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py temp file04.out
-Building file05.out with action(s):
+Building file05.out with action:
   $PYTHON cat.py $SOURCES temp
-  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py file05.in temp
+Building file05.out with action:
+  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py temp file05.out
-Building file06.out with action(s):
+Building file06.out with action:
   $PYTHON cat.py $SOURCES temp
-  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py file06.in temp
+Building file06.out with action:
+  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py temp file06.out
-Building file07.out with action(s):
-  cat(env, target, source)
+Building file07.out with action:
+  cat(target, source, env)
 cat(["file07.out"], ["file07.in"])
-Building file08.out with action(s):
-  cat(env, target, source)
+Building file08.out with action:
+  cat(target, source, env)
 cat(["file08.out"], ["file08.in"])
-Building file09.out with action(s):
-  cat(env, target, source)
+Building file09.out with action:
+  cat(target, source, env)
 cat(["file09.out"], ["file09.in"])
-Building file11.out with action(s):
+Building file11.out with action:
   $PYTHON cat.py $SOURCES $TARGET
 __PYTHON__ cat.py file11.in file11.out
-Building file12.out with action(s):
+Building file12.out with action:
   $PYTHON cat.py $SOURCES $TARGET
 __PYTHON__ cat.py file12.in file12.out
-Building file13.out with action(s):
+Building file13.out with action:
   $PYTHON cat.py $SOURCES temp
-  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py file13.in temp
+Building file13.out with action:
+  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py temp file13.out
-Building file14.out with action(s):
+Building file14.out with action:
   $PYTHON cat.py $SOURCES temp
-  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py file14.in temp
+Building file14.out with action:
+  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py temp file14.out
-Building file15.out with action(s):
+Building file15.out with action:
   $PYTHON cat.py $SOURCES temp
-  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py file15.in temp
+Building file15.out with action:
+  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py temp file15.out
-Building file16.out with action(s):
+Building file16.out with action:
   $PYTHON cat.py $SOURCES temp
-  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py file16.in temp
+Building file16.out with action:
+  $PYTHON cat.py temp $TARGET
 __PYTHON__ cat.py temp file16.out
-Building file17.out with action(s):
-  cat(env, target, source)
+Building file17.out with action:
+  cat(target, source, env)
 cat(["file17.out"], ["file17.in"])
-Building file18.out with action(s):
-  cat(env, target, source)
+Building file18.out with action:
+  cat(target, source, env)
 cat(["file18.out"], ["file18.in"])
 """
 expect = string.replace(expect, '__PYTHON__', TestSCons.python)