release 2.4.02.4.0

1 files changed, 82 insertions, 0 deletions

diff --git a/test/SCONSFLAGS.py b/test/SCONSFLAGS.py
new file mode 100644
index 0000000..db866e8
--- /dev/null
+++ b/test/SCONSFLAGS.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+
+import TestCmd
+import TestSCons
+
+test = TestSCons.TestSCons(match = TestCmd.match_re_dotall,ignore_python_version=0)
+
+wpath = test.workpath()
+
+test.write('SConstruct', r"""
+Help("Help text.\n")
+""")
+
+expect = """scons: Reading SConscript files ...
+scons: done reading SConscript files.
+Help text.
+
+Use scons -H for help about command-line options.
+"""
+
+os.environ['SCONSFLAGS'] = ''
+
+test.run(arguments = '-h',
+         stdout = expect,
+         stderr = TestSCons.deprecated_python_expr)
+
+os.environ['SCONSFLAGS'] = '-h'
+
+test.run(stdout = expect,
+         stderr = TestSCons.deprecated_python_expr)
+
+# No TestSCons.deprecated_python_expr because the -H option gets
+# processed before the SConscript files and therefore before we check
+# for the deprecation warning.
+test.run(arguments = "-H")
+
+test.must_not_contain_any_line(test.stdout(), ['Help text.'])
+test.must_contain_all_lines(test.stdout(), ['-H, --help-options'])
+
+os.environ['SCONSFLAGS'] = '-Z'
+
+expect = r"""usage: scons [OPTION] [TARGET] ...
+
+SCons Error: no such option: -Z
+"""
+
+test.run(arguments = "-H", status = 2,
+         stderr = expect, match=TestSCons.match_exact)
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: