summaryrefslogtreecommitdiff
path: root/test/SConstruct.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-09-30 16:53:47 +0000
committerSteven Knight <knight@baldmt.com>2002-09-30 16:53:47 +0000
commit752502105f63c91ee1f87cc35b83634c6bc42c3b (patch)
tree0b603afdbd7d32b8aa3e7482dc72badf69345874 /test/SConstruct.py
parentf6141b3f503c8f78fca191bfd59d9785cd81bf10 (diff)
downloadscons-752502105f63c91ee1f87cc35b83634c6bc42c3b.tar.gz
Add output to tell people when we're reading SConscript files versus when we're building targets.
Diffstat (limited to 'test/SConstruct.py')
-rw-r--r--test/SConstruct.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/test/SConstruct.py b/test/SConstruct.py
index bf35edce..48f2642a 100644
--- a/test/SConstruct.py
+++ b/test/SConstruct.py
@@ -46,7 +46,9 @@ import os
print "sconstruct", os.getcwd()
""")
-test.run(arguments = ".", stdout = 'sconstruct %s\nscons: "." is up to date.\n' % wpath)
+test.run(arguments = ".",
+ stdout = test.wrap_stdout(read_str = 'sconstruct %s\n' % wpath,
+ build_str = 'scons: "." is up to date.\n'))
test.write('Sconstruct', """
@@ -54,13 +56,17 @@ import os
print "Sconstruct", os.getcwd()
""")
-test.run(arguments = ".", stdout = 'Sconstruct %s\nscons: "." is up to date.\n' % wpath)
+test.run(arguments = ".",
+ stdout = test.wrap_stdout(read_str = 'Sconstruct %s\n' % wpath,
+ build_str = 'scons: "." is up to date.\n'))
test.write('SConstruct', """
import os
print "SConstruct", os.getcwd()
""")
-test.run(arguments = ".", stdout = 'SConstruct %s\nscons: "." is up to date.\n' % wpath)
+test.run(arguments = ".",
+ stdout = test.wrap_stdout(read_str = 'SConstruct %s\n' % wpath,
+ build_str = 'scons: "." is up to date.\n'))
test.pass_test()