diff options
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 3 | ||||
| -rw-r--r-- | test/option-s.py | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index a2690c8..cbaffb3 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,9 @@ RELEASE 2.X.X - + From Mortoray: + - Make -s (silent mode) be silent about entering subdirs (#2976). + From Gary Oberbrunner: - Show valid Visual Studio architectures in error message when user passes invalid arch. 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..f79c347 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 quiet Issue#2796 +test.subdir( 'sub' ) +test.write(['sub','SConstruct'],"") +test.run(arguments = '-s -C sub', stdout = "" ) + test.pass_test() |