diff options
| author | edA-qa mort-ora-y <edA-qa@disemia.com> | 2012-05-05 15:49:07 +0200 |
|---|---|---|
| committer | edA-qa mort-ora-y <edA-qa@disemia.com> | 2012-05-05 15:49:07 +0200 |
| commit | 0e6ade1a94a810f7bb7f6b1407231dcdf3c1c2e8 (patch) | |
| tree | 7a9afa2ebc3f822f6ef966c1d0891607e61f7ca0 | |
| parent | 4ed4c0db27ab349cce3f0f6653bd6c2e61064734 (diff) | |
| download | scons-0e6ade1a94a810f7bb7f6b1407231dcdf3c1c2e8.tar.gz | |
fix for issue 2976
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 3 | ||||
| -rw-r--r-- | test/option-s.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 0e029b5a..bcb013e5 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -869,7 +869,8 @@ def _main(parser): script_dir = '' if script_dir and script_dir != os.getcwd(): - display("scons: Entering directory `%s'" % script_dir) + if not options.silent: + display("scons: Entering directory `%s'" % script_dir) try: os.chdir(script_dir) except OSError: diff --git a/test/option-s.py b/test/option-s.py index 6950fc98..1c8a2333 100644 --- a/test/option-s.py +++ b/test/option-s.py @@ -67,6 +67,11 @@ test.run(arguments = '--quiet f1.out f2.out', stdout = "") test.fail_test(not os.path.exists(test.workpath('f1.out'))) test.fail_test(not os.path.exists(test.workpath('f2.out'))) +# -C should also be quiety Issue#2796 +test.subdir( 'sub' ) +test.write(['sub','SConstruct'],"") +test.run(arguments = '-s -C sub', stdout = "" ) + test.pass_test() |