From 70ca48f0389de490a0f6582aa161b30986af3532 Mon Sep 17 00:00:00 2001 From: edA-qa mort-ora-y Date: Sat, 5 May 2012 15:49:07 +0200 Subject: fix for issue 2976 --- src/engine/SCons/Script/Main.py | 3 ++- test/option-s.py | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 0e029b5..bcb013e 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 6950fc9..1c8a233 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() -- cgit v0.12