Test and document the ability to specify multiple -f files.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3683 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 4f1d316bfb87ca4c161680ceea25fae88aa4d953..78def408e049cfc852b95f02f3b631c9772ffcfa 100644 (file)
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -804,6 +804,12 @@ the mechanisms in the specified order.
 Use
 .I file
 as the initial SConscript file.
+Multiple
+.B -f
+options may be specified,
+in which case
+.B scons
+will read all of the specified files.
 
 .TP
 -h, --help

diff --git a/test/option-f.py b/test/option-f.py
index da3a364ee0dc2dc10dc020b91fd3889adff3c234..a8c7c7b7db8290a8defdc3fee310e99dc4caaf6b 100644 (file)
--- a/test/option-f.py
+++ b/test/option-f.py
@@ -43,6 +43,11 @@ import os
 print "subdir/BuildThis", os.getcwd()
 """)
 
+test.write('Build2', """
+import os
+print "Build2", os.getcwd()
+""")
+
 wpath = test.workpath()
 
 test.run(arguments = '-f SConscript .',
@@ -84,6 +89,10 @@ print "STDIN " + os.getcwd()
          stdout = test.wrap_stdout(read_str = 'STDIN %s\n' % wpath,
                                    build_str = "scons: `.' is up to date.\n"))
 
+expect = test.wrap_stdout(read_str = 'Build2 %s\nSConscript %s\n' % (wpath, wpath),
+                          build_str = "scons: `.' is up to date.\n")
+test.run(arguments = '-f Build2 -f SConscript .', stdout=expect)
+
 test.run(arguments = '-f no_such_file .',
          stdout = test.wrap_stdout("scons: `.' is up to date.\n"),
          stderr = None)