summaryrefslogtreecommitdiff
path: root/test/option--C.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/option--C.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/option--C.py')
-rw-r--r--test/option--C.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/test/option--C.py b/test/option--C.py
index 5bbbd31a..dc39a9b2 100644
--- a/test/option--C.py
+++ b/test/option--C.py
@@ -66,19 +66,24 @@ print GetBuildPath('..')
""")
test.run(arguments = '-C sub .',
- stdout = '%s\nscons: "." is up to date.\n' % wpath)
+ stdout = test.wrap_stdout(read_str = '%s\n' % wpath,
+ build_str = 'scons: "." is up to date.\n'))
test.run(arguments = '-C sub -C dir .',
- stdout = '%s\nscons: "." is up to date.\n' % wpath_sub)
+ stdout = test.wrap_stdout(read_str = '%s\n' % wpath_sub,
+ build_str = 'scons: "." is up to date.\n'))
test.run(arguments = ".",
- stdout = 'SConstruct %s\nscons: "." is up to date.\n' % wpath)
+ stdout = test.wrap_stdout(read_str = 'SConstruct %s\n' % wpath,
+ build_str = 'scons: "." is up to date.\n'))
test.run(arguments = '--directory=sub/dir .',
- stdout = '%s\nscons: "." is up to date.\n' % wpath_sub)
+ stdout = test.wrap_stdout(read_str = '%s\n' % wpath_sub,
+ build_str = 'scons: "." is up to date.\n'))
test.run(arguments = '-C %s -C %s .' % (wpath_sub_dir, wpath_sub),
- stdout = '%s\nscons: "." is up to date.\n' % wpath)
+ stdout = test.wrap_stdout(read_str = '%s\n' % wpath,
+ build_str = 'scons: "." is up to date.\n'))
test.pass_test()