summaryrefslogtreecommitdiffstats
path: root/test/Options.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/Options.py')
-rw-r--r--test/Options.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/test/Options.py b/test/Options.py
index c98ffc6..d9bfd17 100644
--- a/test/Options.py
+++ b/test/Options.py
@@ -141,7 +141,14 @@ test.run(arguments='"DEBUG_BUILD=1"')
check(['1', '1', cc, string.strip(ccflags + ' -O -g'), 'v', 'v'])
test.run(arguments='-h',
- stdout = """scons: Reading SConscript files ...
+ stdout = """\
+scons: Reading SConscript files ...
+1
+0
+%s
+%s
+v
+v
scons: done reading SConscript files.
Variables settable in custom.py or on the command line:
@@ -166,7 +173,7 @@ UNSPECIFIED: An option with no value
actual: None
Use scons -H for help about command-line options.
-"""%cc)
+"""%(cc, ccflags and ccflags + ' -O' or '-O', cc))
# Test saving of options and multi loading
#
@@ -288,7 +295,8 @@ Help('Variables settable in custom.py or on the command line:\\n' + opts.Generat
""")
test.run(arguments='-h',
- stdout = """scons: Reading SConscript files ...
+ stdout = """\
+scons: Reading SConscript files ...
scons: done reading SConscript files.
Variables settable in custom.py or on the command line: