Add output to tell people when we're reading SConscript files versus when we're building targets.

1 files changed, 20 insertions, 12 deletions

diff --git a/test/option-f.py b/test/option-f.py
index 30c49bbd..cda5ab86 100644
--- a/test/option-f.py
+++ b/test/option-f.py
@@ -46,38 +46,46 @@ print "subdir/BuildThis", os.getcwd()
 wpath = test.workpath()
 
 test.run(arguments = '-f SConscript .',
-	 stdout = 'SConscript %s\nscons: "." is up to date.\n' % wpath)
-
+         stdout = test.wrap_stdout(read_str = 'SConscript %s\n' % wpath,
+                                   build_str = 'scons: "." is up to date.\n'))
 
 test.run(arguments = '-f %s .' % subdir_BuildThis,
-	 stdout = 'subdir/BuildThis %s\nscons: "." is up to date.\n' % wpath)
+         stdout = test.wrap_stdout(read_str = 'subdir/BuildThis %s\n' % wpath,
+                                   build_str = 'scons: "." is up to date.\n'))
 
 test.run(arguments = '--file=SConscript .',
-	 stdout = 'SConscript %s\nscons: "." is up to date.\n' % wpath)
+         stdout = test.wrap_stdout(read_str = 'SConscript %s\n' % wpath,
+                                   build_str = 'scons: "." is up to date.\n'))
 
 test.run(arguments = '--file=%s .' % subdir_BuildThis,
-	 stdout = 'subdir/BuildThis %s\nscons: "." is up to date.\n' % wpath)
+         stdout = test.wrap_stdout(read_str = 'subdir/BuildThis %s\n' % wpath,
+                                   build_str = 'scons: "." is up to date.\n'))
 
 test.run(arguments = '--makefile=SConscript .',
-	 stdout = 'SConscript %s\nscons: "." is up to date.\n' % wpath)
+         stdout = test.wrap_stdout(read_str = 'SConscript %s\n' % wpath,
+                                   build_str = 'scons: "." is up to date.\n'))
 
 test.run(arguments = '--makefile=%s .' % subdir_BuildThis,
-	 stdout = 'subdir/BuildThis %s\nscons: "." is up to date.\n' % wpath)
+         stdout = test.wrap_stdout(read_str = 'subdir/BuildThis %s\n' % wpath,
+                                   build_str = 'scons: "." is up to date.\n'))
 
 test.run(arguments = '--sconstruct=SConscript .',
-	 stdout = 'SConscript %s\nscons: "." is up to date.\n' % wpath)
+         stdout = test.wrap_stdout(read_str = 'SConscript %s\n' % wpath,
+                                   build_str = 'scons: "." is up to date.\n'))
 
 test.run(arguments = '--sconstruct=%s .' % subdir_BuildThis,
-	 stdout = 'subdir/BuildThis %s\nscons: "." is up to date.\n' % wpath)
+         stdout = test.wrap_stdout(read_str = 'subdir/BuildThis %s\n' % wpath,
+                                   build_str = 'scons: "." is up to date.\n'))
 
 test.run(arguments = '-f - .', stdin = """
 import os
 print "STDIN " + os.getcwd()
 """,
-	 stdout = 'STDIN %s\nscons: "." is up to date.\n' % wpath)
+         stdout = test.wrap_stdout(read_str = 'STDIN %s\n' % wpath,
+                                   build_str = 'scons: "." is up to date.\n'))
 
 test.run(arguments = '-f no_such_file .',
-	 stdout = 'scons: "." is up to date.\n',
-	 stderr = "Ignoring missing SConscript 'no_such_file'\n")
+         stdout = test.wrap_stdout('scons: "." is up to date.\n'),
+         stderr = "Ignoring missing SConscript 'no_such_file'\n")
 
 test.pass_test()