merge in changes from SCons default

5 files changed, 66 insertions, 62 deletions

diff --git a/test/Deprecated/SourceCode/Perforce/Perforce.py b/test/Deprecated/SourceCode/Perforce/Perforce.py
index d732b57..ebf9cfb 100644
--- a/test/Deprecated/SourceCode/Perforce/Perforce.py
+++ b/test/Deprecated/SourceCode/Perforce/Perforce.py
@@ -85,13 +85,8 @@ class TestPerforce(TestSCons.TestSCons):
             # We don't use self.run() because the TestCmd logic will hang
             # waiting for the daemon to exit, even when we pass it
             # the -d option.
-            try:
-                spawnv = os.spawnv
-            except AttributeError:
-                os.system(' '.join(args))
-            else:
-                spawnv(os.P_NOWAIT, self.p4d, args)
-                self.sleep(2)
+            os.spawnv(os.P_NOWAIT, self.p4d, args)
+            self.sleep(2)
         else:
             import socket
             s = socket.socket()
diff --git a/test/EnsurePythonVersion.py b/test/EnsurePythonVersion.py
index 8e1a0f3..b40bc71 100644
--- a/test/EnsurePythonVersion.py
+++ b/test/EnsurePythonVersion.py
@@ -43,58 +43,6 @@ Exit(0)
 
 test.run(status=2)
 
-test.write('SConstruct', """\
-import sys
-try:
-    delattr(sys, 'version_info')
-except AttributeError:
-    pass
-sys.version = '2.3b1 (#0, Feb 24 2003, 19:13:11)\\n'
-EnsurePythonVersion(1,3)
-Exit(0)
-""")
-
-test.run()
-
-test.write('SConstruct', """\
-import sys
-try:
-    delattr(sys, 'version_info')
-except AttributeError:
-    pass
-sys.version = '2.3+ (#0, Feb 24 2003, 19:13:11)\\n'
-EnsurePythonVersion(2,2)
-Exit(0)
-""")
-
-test.run()
-
-test.write('SConstruct', """\
-import sys
-try:
-    delattr(sys, 'version_info')
-except AttributeError:
-    pass
-sys.version = '2.3b1 (#0, Feb 24 2003, 19:13:11)\\n'
-EnsurePythonVersion(2,3)
-Exit(0)
-""")
-
-test.run()
-
-test.write('SConstruct', """\
-import sys
-try:
-    delattr(sys, 'version_info')
-except AttributeError:
-    pass
-sys.version = '2.3b1 (#0, Feb 24 2003, 19:13:11)\\n'
-EnsurePythonVersion(2,4)
-Exit(0)
-""")
-
-test.run(status=2)
-
 
 
 test.pass_test()
diff --git a/test/option--duplicate.py b/test/option--duplicate.py
index 7524c96..cccc185 100644
--- a/test/option--duplicate.py
+++ b/test/option--duplicate.py
@@ -123,7 +123,8 @@ RunTest('copy', type, bss)
 test.run(arguments='--duplicate=nonsense', status=2, stderr="""\
 usage: scons [OPTION] [TARGET] ...
 
-SCons error: `nonsense' is not a valid duplication style.
+SCons Error: `nonsense' is not a valid duplication option type, try:
+    hard-soft-copy, soft-hard-copy, hard-copy, soft-copy, copy
 """)
 
 test.pass_test()
diff --git a/test/option--tree.py b/test/option--tree.py
new file mode 100644
index 0000000..a50433c
--- /dev/null
+++ b/test/option--tree.py
@@ -0,0 +1,60 @@
+#!/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 TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', "")
+
+test.run(arguments = '-Q --tree=prune',
+         stdout = """scons: `.' is up to date.
++-.
+  +-SConstruct
+""")
+
+test.run(arguments = '-Q --tree=foofoo',
+         stderr = """usage: scons [OPTION] [TARGET] ...
+
+SCons Error: `foofoo' is not a valid --tree option type, try:
+    all, derived, prune, status
+""",
+         status = 2)
+
+test.run(arguments = '--debug=tree',
+         stderr = """
+scons: warning: The --debug=tree option is deprecated; please use --tree=all instead.
+.*
+""",
+         status = 0, match=TestSCons.match_re_dotall)
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option-unknown.py b/test/option-unknown.py
index cbda8dd..8b42762 100644
--- a/test/option-unknown.py
+++ b/test/option-unknown.py
@@ -33,14 +33,14 @@ test.write('SConstruct', "")
 test.run(arguments = '-Z',
          stderr = """usage: scons [OPTION] [TARGET] ...
 
-SCons error: no such option: -Z
+SCons Error: no such option: -Z
 """,
          status = 2)
 
 test.run(arguments = '--ZizzerZazzerZuzz',
          stderr = """usage: scons [OPTION] [TARGET] ...
 
-SCons error: no such option: --ZizzerZazzerZuzz
+SCons Error: no such option: --ZizzerZazzerZuzz
 """,
          status = 2)