diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-12-05 02:39:27 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2009-12-05 02:39:27 (GMT) |
| commit | 37689e305adae32d009ae3a5802015e35fe31668 (patch) | |
| tree | 187d65ca657c533e56625daffc8154dddccd9408 /test | |
| parent | 3bbb6edb17c8c7133cb15fc3ac7a7d5556daf005 (diff) | |
| download | SCons-37689e305adae32d009ae3a5802015e35fe31668.zip SCons-37689e305adae32d009ae3a5802015e35fe31668.tar.gz SCons-37689e305adae32d009ae3a5802015e35fe31668.tar.bz2 | |
Integrate patch from issue #2436: fix regression from r3691 which stopped printing "Entering Directory" with -C/-u.
Diffstat (limited to 'test')
| -rw-r--r-- | test/option--C.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/test/option--C.py b/test/option--C.py index fac7548..3d93d2f 100644 --- a/test/option--C.py +++ b/test/option--C.py @@ -68,24 +68,28 @@ print env.GetBuildPath('../$FOO/$BAR') """) test.run(arguments = '-C sub .', - stdout = test.wrap_stdout(read_str = '%s\n' % wpath, - build_str = "scons: `.' is up to date.\n")) + stdout = "scons: Entering directory `%s'\n" % wpath_sub \ + + test.wrap_stdout(read_str = '%s\n' % wpath, + build_str = "scons: `.' is up to date.\n")) test.run(arguments = '-C sub -C dir .', - stdout = test.wrap_stdout(read_str = '%s\n' % wpath_sub_foo_bar, - build_str = "scons: `.' is up to date.\n")) + stdout = "scons: Entering directory `%s'\n" % wpath_sub_dir \ + + test.wrap_stdout(read_str = '%s\n' % wpath_sub_foo_bar, + build_str = "scons: `.' is up to date.\n")) test.run(arguments = ".", 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 = test.wrap_stdout(read_str = '%s\n' % wpath_sub_foo_bar, - build_str = "scons: `.' is up to date.\n")) + stdout = "scons: Entering directory `%s'\n" % wpath_sub_dir \ + + test.wrap_stdout(read_str = '%s\n' % wpath_sub_foo_bar, + build_str = "scons: `.' is up to date.\n")) test.run(arguments = '-C %s -C %s .' % (wpath_sub_dir, wpath_sub), - stdout = test.wrap_stdout(read_str = '%s\n' % wpath, - build_str = "scons: `.' is up to date.\n")) + stdout = "scons: Entering directory `%s'\n" % wpath_sub \ + + test.wrap_stdout(read_str = '%s\n' % wpath, + build_str = "scons: `.' is up to date.\n")) test.pass_test() |