summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/man/scons.16
-rw-r--r--test/option-f.py9
2 files changed, 15 insertions, 0 deletions
diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 4f1d316..78def40 100644
--- 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 da3a364..a8c7c7b 100644
--- 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)