Merge branch 'master' into CmdStringHolder

37 files changed, 291 insertions, 563 deletions

diff --git a/test/Configure/config-h.py b/test/Configure/config-h.py
index a5c1998..405f259 100644
--- a/test/Configure/config-h.py
+++ b/test/Configure/config-h.py
@@ -46,25 +46,27 @@ env.AppendENVPath('PATH', os.environ['PATH'])
 conf = Configure(env, config_h = 'config.h')
 r1 = conf.CheckFunc('printf')
 r2 = conf.CheckFunc('noFunctionCall')
-r3 = conf.CheckType('int')
-r4 = conf.CheckType('noType')
-r5 = conf.CheckCHeader('stdio.h', '<>')
-r6 = conf.CheckCHeader('hopefullynoc-header.h')
-r7 = conf.CheckCXXHeader('vector', '<>')
-r8 = conf.CheckCXXHeader('hopefullynocxx-header.h')
+r3 = conf.CheckFunc('memmove')
+r4 = conf.CheckType('int')
+r5 = conf.CheckType('noType')
+r6 = conf.CheckCHeader('stdio.h', '<>')
+r7 = conf.CheckCHeader('hopefullynoc-header.h')
+r8 = conf.CheckCXXHeader('vector', '<>')
+r9 = conf.CheckCXXHeader('hopefullynocxx-header.h')
 env = conf.Finish()
 conf = Configure(env, config_h = 'config.h')
-r9 = conf.CheckLib('%(lib)s', 'sin')
-r10 = conf.CheckLib('hopefullynolib', 'sin')
-r11 = conf.CheckLibWithHeader('%(lib)s', 'math.h', 'c')
-r12 = conf.CheckLibWithHeader('%(lib)s', 'hopefullynoheader2.h', 'c')
-r13 = conf.CheckLibWithHeader('hopefullynolib2', 'math.h', 'c')
+r10 = conf.CheckLib('%(lib)s', 'sin')
+r11 = conf.CheckLib('hopefullynolib', 'sin')
+r12 = conf.CheckLibWithHeader('%(lib)s', 'math.h', 'c')
+r13 = conf.CheckLibWithHeader('%(lib)s', 'hopefullynoheader2.h', 'c')
+r14 = conf.CheckLibWithHeader('hopefullynolib2', 'math.h', 'c')
 env = conf.Finish()
 """ % locals())
 
 expected_read_str = """\
 Checking for C function printf()... yes
 Checking for C function noFunctionCall()... no
+Checking for C function memmove()... yes
 Checking for C type int... yes
 Checking for C type noType... no
 Checking for C header file stdio.h... yes
@@ -96,6 +98,9 @@ expected_config_h = ("""\
 /* Define to 1 if the system has the function `noFunctionCall'. */
 /* #undef HAVE_NOFUNCTIONCALL */
 
+/* Define to 1 if the system has the function `memmove'. */
+#define HAVE_MEMMOVE 1
+
 /* Define to 1 if the system has the type `int'. */
 #define HAVE_INT 1
 
diff --git a/test/Deprecated/debug-dtree.py b/test/Deprecated/debug-dtree.py
deleted file mode 100644
index 1e7366f..0000000
--- a/test/Deprecated/debug-dtree.py
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/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__"
-
-"""
-Test that the --debug=dtree option correctly prints just the explicit
-dependencies (sources or Depends()) of a target.
-"""
-
-import TestSCons
-
-test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
-
-test.write('SConstruct', """
-env = Environment(OBJSUFFIX = '.ooo', PROGSUFFIX = '.xxx')
-env.Program('foo', Split('foo.c bar.c'))
-""")
-
-test.write('foo.c', r"""
-#include <stdio.h>
-#include <stdlib.h>
-#include "foo.h"
-int main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("f1.c\n");
-        exit (0);
-}
-""")
-
-test.write('bar.c', """
-#include "bar.h"
-int local = 1;
-""")
-
-test.write('foo.h', """
-#ifndef FOO_H
-#define FOO_H
-#include "bar.h"
-#endif
-""")
-
-test.write('bar.h', """
-#ifndef BAR_H
-#define BAR_H
-#include "foo.h"
-#endif
-""")
-
-expect = """
-scons: warning: The --debug=dtree option is deprecated; please use --tree=derived instead.
-"""
-
-stderr = TestSCons.re_escape(expect) + TestSCons.file_expr
-
-dtree1 = """
-+-foo.xxx
-  +-foo.ooo
-  +-bar.ooo
-"""
-
-test.run(arguments = "--debug=dtree foo.xxx",
-         stderr = stderr)
-test.must_contain_all_lines(test.stdout(), [dtree1])
-
-dtree2 = """
-+-.
-  +-bar.ooo
-  +-foo.ooo
-  +-foo.xxx
-    +-foo.ooo
-    +-bar.ooo
-"""
-test.run(arguments = "--debug=dtree .",
-         stderr = stderr)
-test.must_contain_all_lines(test.stdout(), [dtree2])
-
-# Make sure we print the debug stuff even if there's a build failure.
-test.write('bar.h', """
-#ifndef BAR_H
-#define BAR_H
-#include "foo.h"
-#endif
-THIS SHOULD CAUSE A BUILD FAILURE
-""")
-
-test.run(arguments = "--debug=dtree foo.xxx",
-         status = 2,
-         stderr = None)
-test.must_contain_all_lines(test.stdout(), [dtree1])
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/debug-stree.py b/test/Deprecated/debug-stree.py
deleted file mode 100644
index 907dedf..0000000
--- a/test/Deprecated/debug-stree.py
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/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__"
-
-"""
-Test that the --debug=stree option prints a dependency tree with output
-that indicates the state of various Node status flags.
-"""
-
-import TestSCons
-
-test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
-
-CC = test.detect('CC')
-LINK = test.detect('LINK')
-if LINK is None: LINK = CC
-
-test.write('SConstruct', """
-env = Environment(OBJSUFFIX = '.ooo', PROGSUFFIX = '.xxx')
-env.Program('foo', Split('foo.c bar.c'))
-""")
-
-test.write('foo.c', r"""
-#include <stdio.h>
-#include <stdlib.h>
-#include "foo.h"
-int main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("f1.c\n");
-        exit (0);
-}
-""")
-
-test.write('bar.c', """
-#include "bar.h"
-int local = 1;
-""")
-
-test.write('foo.h', """
-#ifndef FOO_H
-#define FOO_H
-#include "bar.h"
-#endif
-""")
-
-test.write('bar.h', """
-#ifndef BAR_H
-#define BAR_H
-#include "foo.h"
-#endif
-""")
-
-expect = """
-scons: warning: The --debug=stree option is deprecated; please use --tree=all,status instead.
-"""
-
-stderr = TestSCons.re_escape(expect) + TestSCons.file_expr
-
-stree = """
-[E B   C  ]+-foo.xxx
-[E B   C  ]  +-foo.ooo
-[E     C  ]  | +-foo.c
-[E     C  ]  | +-foo.h
-[E     C  ]  | +-bar.h
-[E     C  ]  | +-%(CC)s
-[E B   C  ]  +-bar.ooo
-[E     C  ]  | +-bar.c
-[E     C  ]  | +-bar.h
-[E     C  ]  | +-foo.h
-[E     C  ]  | +-%(CC)s
-[E     C  ]  +-%(LINK)s
-""" % locals()
-
-test.run(arguments = "--debug=stree foo.xxx",
-         stderr = stderr)
-test.fail_test(test.stdout().count(stree) != 1)
-
-stree2 = """
- E         = exists
-  R        = exists in repository only
-   b       = implicit builder
-   B       = explicit builder
-    S      = side effect
-     P     = precious
-      A    = always build
-       C   = current
-        N  = no clean
-         H = no cache
-
-[  B      ]+-foo.xxx
-[  B      ]  +-foo.ooo
-[E     C  ]  | +-foo.c
-[E     C  ]  | +-foo.h
-[E     C  ]  | +-bar.h
-[E     C  ]  | +-%(CC)s
-[  B      ]  +-bar.ooo
-[E     C  ]  | +-bar.c
-[E     C  ]  | +-bar.h
-[E     C  ]  | +-foo.h
-[E     C  ]  | +-%(CC)s
-[E     C  ]  +-%(LINK)s
-""" % locals()
-
-test.run(arguments = '-c foo.xxx')
-
-test.run(arguments = "--no-exec --debug=stree foo.xxx",
-         stderr = stderr)
-test.fail_test(test.stdout().count(stree2) != 1)
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/debug-tree.py b/test/Deprecated/debug-tree.py
deleted file mode 100644
index 51ff7f2..0000000
--- a/test/Deprecated/debug-tree.py
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/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__"
-
-"""
-Test that the --debug=tree option prints a tree representation of the
-complete dependencies of a target.
-"""
-
-import TestSCons
-
-test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
-
-CC = test.detect('CC')
-LINK = test.detect('LINK')
-if LINK is None: LINK = CC
-
-test.write('SConstruct', """
-env = Environment(OBJSUFFIX = '.ooo', PROGSUFFIX = '.xxx')
-env.Program('Foo', Split('Foo.c Bar.c'))
-""")
-
-# N.B.:  We use upper-case file names (Foo* and Bar*) so that the sorting
-# order with our upper-case SConstruct file is the same on case-sensitive
-# (UNIX/Linux) and case-insensitive (Windows) systems.
-
-test.write('Foo.c', r"""
-#include <stdio.h>
-#include <stdlib.h>
-#include "Foo.h"
-int main(int argc, char *argv[])
-{
-        argv[argc++] = "--";
-        printf("f1.c\n");
-        exit (0);
-}
-""")
-
-test.write('Bar.c', """
-#include "Bar.h"
-int local = 1;
-""")
-
-test.write('Foo.h', """
-#ifndef FOO_H
-#define FOO_H
-#include "Bar.h"
-#endif
-""")
-
-test.write('Bar.h', """
-#ifndef BAR_H
-#define BAR_H
-#include "Foo.h"
-#endif
-""")
-
-expect = """
-scons: warning: The --debug=tree option is deprecated; please use --tree=all instead.
-"""
-
-stderr = TestSCons.re_escape(expect) + TestSCons.file_expr
-
-tree1 = """
-+-Foo.xxx
-  +-Foo.ooo
-  | +-Foo.c
-  | +-Foo.h
-  | +-Bar.h
-  | +-%(CC)s
-  +-Bar.ooo
-  | +-Bar.c
-  | +-Bar.h
-  | +-Foo.h
-  | +-%(CC)s
-  +-%(LINK)s
-""" % locals()
-
-test.run(arguments = "--debug=tree Foo.xxx",
-         stderr = stderr)
-test.must_contain_all_lines(test.stdout(), tree1)
-
-tree2 = """
-+-.
-  +-Bar.c
-  +-Bar.h
-  +-Bar.ooo
-  | +-Bar.c
-  | +-Bar.h
-  | +-Foo.h
-  | +-%(CC)s
-  +-Foo.c
-  +-Foo.h
-  +-Foo.ooo
-  | +-Foo.c
-  | +-Foo.h
-  | +-Bar.h
-  | +-%(CC)s
-  +-Foo.xxx
-  | +-Foo.ooo
-  | | +-Foo.c
-  | | +-Foo.h
-  | | +-Bar.h
-  | | +-%(CC)s
-  | +-Bar.ooo
-  | | +-Bar.c
-  | | +-Bar.h
-  | | +-Foo.h
-  | | +-%(CC)s
-  | +-%(LINK)s
-  +-SConstruct
-""" % locals()
-
-test.run(arguments = "--debug=tree .",
-         stderr = stderr)
-test.must_contain_all_lines(test.stdout(), tree2)
-
-# Make sure we print the debug stuff even if there's a build failure.
-test.write('Bar.h', """
-#ifndef BAR_H
-#define BAR_H
-#include "Foo.h"
-#endif
-THIS SHOULD CAUSE A BUILD FAILURE
-""")
-
-test.run(arguments = "--debug=tree Foo.xxx",
-         status = 2,
-         stderr = None)
-test.must_contain_all_lines(test.stdout(), tree1)
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Errors/execute-a-directory.py b/test/Errors/execute-a-directory.py
index 1d2036e..95fa7b6 100644
--- a/test/Errors/execute-a-directory.py
+++ b/test/Errors/execute-a-directory.py
@@ -55,34 +55,34 @@ Bad command or file name
 unrecognized = """\
 '.+' is not recognized as an internal or external command,
 operable program or batch file.
-scons: \*\*\* \[%s\] Error 1
+scons: \\*\\*\\* \\[%s\\] Error 1
 """
 
 unspecified = """\
 The name specified is not recognized as an
 internal or external command, operable program or batch file.
-scons: \*\*\* \[%s\] Error 1
+scons: \\*\\*\\* \\[%s\\] Error 1
 """
 
 cannot_execute = """\
 (sh: )*.+: cannot execute
-scons: \*\*\* \[%s\] Error %s
+scons: \\*\\*\\* \\[%s\\] Error %s
 """
 
 permission_denied = """\
 .+: (p|P)ermission denied
-scons: \*\*\* \[%s\] Error %s
+scons: \\*\\*\\* \\[%s\\] Error %s
 """
 
 is_a_directory = """\
 .+: (i|I)s a directory
-scons: \*\*\* \[%s\] Error %s
+scons: \\*\\*\\* \\[%s\\] Error %s
 """
 
 konnte_nicht_gefunden_werden = """\
 Der Befehl ".+" ist entweder falsch geschrieben oder
 konnte nicht gefunden werden.
-scons: \*\*\* \[%s\] Error %s
+scons: \\*\\*\\* \\[%s\\] Error %s
 """
 
 test.description_set("Incorrect STDERR:\n%s\n" % test.stderr())
diff --git a/test/Errors/non-executable-file.py b/test/Errors/non-executable-file.py
index e1b8f4e..0e00c77 100644
--- a/test/Errors/non-executable-file.py
+++ b/test/Errors/non-executable-file.py
@@ -44,29 +44,29 @@ Bad command or file name
 unrecognized = """\
 '.+' is not recognized as an internal or external command,
 operable program or batch file.
-scons: \*\*\* \[%s\] Error 1
+scons: \\*\\*\\* \\[%s\\] Error 1
 """
 
 unspecified = """\
 The name specified is not recognized as an
 internal or external command, operable program or batch file.
-scons: \*\*\* \[%s\] Error 1
+scons: \\*\\*\\* \\[%s\\] Error 1
 """
 
 cannot_execute = """\
 (sh: )*.+: cannot execute
-scons: \*\*\* \[%s\] Error %s
+scons: \\*\\*\\* \\[%s\\] Error %s
 """
 
 permission_denied = """\
 .+: (p|P)ermission denied
-scons: \*\*\* \[%s\] Error %s
+scons: \\*\\*\\* \\[%s\\] Error %s
 """
 
 konnte_nicht_gefunden_werden = """\
 Der Befehl ".+" ist entweder falsch geschrieben oder
 konnte nicht gefunden werden.
-scons: \*\*\* \[%s\] Error %s
+scons: \\*\\*\\* \\[%s\\] Error %s
 """
 
 test.write('SConstruct', r"""
diff --git a/test/Interactive/shell.py b/test/Interactive/shell.py
index 40df86f..dd13504 100644
--- a/test/Interactive/shell.py
+++ b/test/Interactive/shell.py
@@ -89,8 +89,8 @@ if sys.platform == 'win32':
 else:
     no_such_error = 'scons: no_such_command: No such file or directory'
 
-expect_stdout = """\
-scons>>> Copy\("foo.out", "foo.in"\)
+expect_stdout = \
+r"""scons>>> Copy\("foo.out", "foo.in"\)
 Touch\("1"\)
 scons>>> hello from shell_command.py
 scons>>> ![^"]+ ".*"
diff --git a/test/Interactive/tree.py b/test/Interactive/tree.py
index 61faa22..c10962a 100644
--- a/test/Interactive/tree.py
+++ b/test/Interactive/tree.py
@@ -69,23 +69,6 @@ test.must_match(test.workpath('foo.out'), "foo.in 2\n")
 
 
 
-scons.send("build --debug=tree foo.out\n")
-
-expect_stdout = """\
-scons>>> Copy("foo.out", "foo.in")
-scons>>> Touch("1")
-scons>>> Copy("foo.out", "foo.in")
-+-foo.out
-  +-foo.in
-scons>>> Touch("2")
-scons>>> scons: `foo.out' is up to date.
-scons>>> 
-"""
-
-test.finish(scons, stdout = expect_stdout)
-
-
-
 test.pass_test()
 
 # Local Variables:
diff --git a/test/Interactive/version.py b/test/Interactive/version.py
index d0f362a..88416ad 100644
--- a/test/Interactive/version.py
+++ b/test/Interactive/version.py
@@ -40,7 +40,7 @@ test.write('SConstruct', "")
 # Standard copyright marker is mangled so it doesn't get replaced
 # by the packaging build.
 copyright_line = """\
-(_{2}COPYRIGHT__|Copyright \\(c\\) 2001[-\d, ]+ The SCons Foundation)
+(_{2}COPYRIGHT__|Copyright \\(c\\) 2001[-\\d, ]+ The SCons Foundation)
 """
 
 expect1 = """\
@@ -53,8 +53,8 @@ scons>>>
 scons>>> 
 """
 
-test.run(arguments = '-Q --interactive',
-         stdin = "version\nexit\n")
+test.run(arguments='-Q --interactive',
+         stdin="version\nexit\n")
 
 # Windows may or may not print a line for the script version
 # depending on whether it's invoked through scons.py or scons.bat.
diff --git a/test/Java/JARFLAGS.py b/test/Java/JARFLAGS.py
index 39a0a6c..6983bf7 100644
--- a/test/Java/JARFLAGS.py
+++ b/test/Java/JARFLAGS.py
@@ -59,10 +59,10 @@ public class Example1
 """)
 
 expect = test.wrap_stdout("""\
-javac -d classes -sourcepath src src.Example1\.java
-jar cvf test.jar -C classes src.Example1\.class
+javac -d classes -sourcepath src src.Example1\\.java
+jar cvf test.jar -C classes src.Example1\\.class
 .*
-adding: src.Example1\.class.*
+adding: src.Example1\\.class.*
 """ % locals())
 
 
diff --git a/test/Java/JAVABOOTCLASSPATH.py b/test/Java/JAVABOOTCLASSPATH.py
index 196cc54..8aaf869 100644
--- a/test/Java/JAVABOOTCLASSPATH.py
+++ b/test/Java/JAVABOOTCLASSPATH.py
@@ -84,8 +84,8 @@ public class Example2
 bootclasspath = os.pathsep.join(['dir1', 'dir2'])
 
 expect = """\
-javac -bootclasspath %(bootclasspath)s -d class -sourcepath com com.Example1\.java
-javac -bootclasspath %(bootclasspath)s -d class -sourcepath com com.Example2\.java
+javac -bootclasspath %(bootclasspath)s -d class -sourcepath com com.Example1\\.java
+javac -bootclasspath %(bootclasspath)s -d class -sourcepath com com.Example2\\.java
 """ % locals()
 
 test.run(arguments = '-Q -n .', stdout = expect, match=TestSCons.match_re)
diff --git a/test/Libs/SharedLibrary.py b/test/Libs/SharedLibrary.py
index cc3fa66..9e22cfa 100644
--- a/test/Libs/SharedLibrary.py
+++ b/test/Libs/SharedLibrary.py
@@ -223,20 +223,17 @@ if sys.platform == 'cygwin':
 
 
 if sys.platform == 'win32' or sys.platform.find('irix') != -1:
-    test.run(arguments = '-f SConstructFoo')
+    test.run(arguments='-f SConstructFoo')
 else:
-    test.run(arguments = '-f SConstructFoo', status=2, stderr='''\
-scons: \*\*\* \[.*\] Source file: foo\..* is static and is not compatible with shared target: .*
-''',
-    match=TestSCons.match_re_dotall)
+    expect = r"scons: \*\*\* \[.*\] Source file: foo\..* is static and is not compatible with shared target: .*"
+    test.run(arguments='-f SConstructFoo', status=2, stderr=expect,
+             match=TestSCons.match_re_dotall)
     # Run it again to make sure that we still get the error
     # even though the static objects already exist.
-    test.run(arguments = '-f SConstructFoo', status=2, stderr='''\
-scons: \*\*\* \[.*\] Source file: foo\..* is static and is not compatible with shared target: .*
-''',
-    match=TestSCons.match_re_dotall)
+    test.run(arguments='-f SConstructFoo', status=2, stderr=expect,
+             match=TestSCons.match_re_dotall)
 
-test.run(arguments = '-f SConstructFoo2',
+test.run(arguments='-f SConstructFoo2',
          stderr=TestSCons.noisy_ar,
          match=TestSCons.match_re_dotall)
 
diff --git a/test/Removed/debug-dtree.py b/test/Removed/debug-dtree.py
new file mode 100644
index 0000000..a016f96
--- /dev/null
+++ b/test/Removed/debug-dtree.py
@@ -0,0 +1,57 @@
+#!/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__"
+
+"""
+Test that the --debug=dtree option fails with expected exception
+"""
+
+import os
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+
+test.write('SConstruct', "")
+
+expect = r"""usage: scons [OPTION] [TARGET] ...
+
+SCons Error: `dtree' is not a valid debug option type ; please use --tree=derived instead
+"""
+
+test.run(arguments='-Q --debug=dtree', status=2, stderr=expect)
+
+os.environ['SCONSFLAGS'] = '--debug=dtree'
+test.run(arguments="-H", status=2, stderr=expect)
+
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Deprecated/debug-nomemoizer.py b/test/Removed/debug-nomemoizer.py
index 6d05cb2..a830a88 100644
--- a/test/Deprecated/debug-nomemoizer.py
+++ b/test/Removed/debug-nomemoizer.py
@@ -25,30 +25,28 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
-Test calling the (deprecated) --debug=nomemoizer option.
+Test that the --debug=nomemoizer option fails with expected exception
 """
 
+import os
+
 import TestSCons
 
-test = TestSCons.TestSCons(match = TestSCons.match_re)
+test = TestSCons.TestSCons()
+
 
-test.write('SConstruct', """
-def cat(target, source, env):
-    with open(str(target[0]), 'wb') as ofp, open(str(source[0]), 'rb') as ifp:
-        ofp.write(ifp.read())
-env = Environment(BUILDERS={'Cat':Builder(action=Action(cat))})
-env.Cat('file.out', 'file.in')
-""")
+test.write('SConstruct', "")
 
-test.write('file.in', "file.in\n")
+expect=r"""usage: scons [OPTION] [TARGET] ...
+
+SCons Error: `nomemoizer' is not a valid debug option type ; there is no replacement
+"""
 
-expect = """
-scons: warning: The --debug=nomemoizer option is deprecated and has no effect.
-""" + TestSCons.file_expr
+test.run(arguments='-Q --debug=nomemoizer', status=2, stderr=expect)
 
-test.run(arguments = "--debug=nomemoizer", stderr = expect)
+os.environ['SCONSFLAGS'] = '--debug=nomemoizer'
+test.run(arguments="-H", status=2, stderr=expect)
 
-test.must_match('file.out', "file.in\n")
 
 test.pass_test()
 
diff --git a/test/Removed/debug-stree.py b/test/Removed/debug-stree.py
new file mode 100644
index 0000000..60ce4f2
--- /dev/null
+++ b/test/Removed/debug-stree.py
@@ -0,0 +1,57 @@
+#!/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__"
+
+"""
+Test that the --debug=stree option fails with expected exception
+"""
+
+import os
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+
+test.write('SConstruct', "")
+
+expect = r"""usage: scons [OPTION] [TARGET] ...
+
+SCons Error: `stree' is not a valid debug option type ; please use --tree=all,status instead
+"""
+
+test.run(arguments='-Q --debug=stree', status=2, stderr=expect)
+
+os.environ['SCONSFLAGS'] = '--debug=stree'
+test.run(arguments="-H", status=2, stderr=expect)
+
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Removed/debug-tree.py b/test/Removed/debug-tree.py
new file mode 100644
index 0000000..06287de
--- /dev/null
+++ b/test/Removed/debug-tree.py
@@ -0,0 +1,64 @@
+#!/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__"
+
+"""
+Test that the --debug=tree option fails with expected exception
+Check command-line, SCONSFLAGS and interactive
+"""
+
+import os
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+
+test.write('SConstruct', "")
+
+expect = r"""usage: scons [OPTION] [TARGET] ...
+
+SCons Error: `tree' is not a valid debug option type ; please use --tree=all instead
+"""
+
+test.run(arguments='-Q --debug=tree', status=2, stderr=expect)
+
+os.environ['SCONSFLAGS'] = '--debug=tree'
+test.run(arguments="-H", status=2, stderr=expect)
+
+
+# moved test from test/Interactive/tree.py
+scons = test.start(arguments = '-Q --interactive')
+scons.send("build --debug=tree\n")
+test.finish(scons, status=2, stderr=expect)
+
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/Scanner/CrossLanguageNoExtension.py b/test/Scanner/CrossLanguageNoExtension.py
index 0016ca5..fa38d2f 100644
--- a/test/Scanner/CrossLanguageNoExtension.py
+++ b/test/Scanner/CrossLanguageNoExtension.py
@@ -34,7 +34,7 @@ test = TestSCons.TestSCons()
 # for nodes that do not have mappings from their scanner_key
 # to a scanner instance
 
-test.write('SConstruct', """
+test.write('SConstruct', r"""
 import re
 
 include_re = re.compile(r'^include\s+(\S+)$', re.M)
@@ -77,7 +77,7 @@ env2.Append(SCANNERS = [ k2scan2 ] )
 env2.Command( 'k2', 'foo.k', Copy( '$TARGET', '$SOURCE' ) )
 """)
 
-test.write('foo.k', 
+test.write('foo.k',
 """foo.k 1 line 1
 include xxx.k
 include yyy
diff --git a/test/Scanner/FindPathDirs.py b/test/Scanner/FindPathDirs.py
index 34eb779..3f5204a 100644
--- a/test/Scanner/FindPathDirs.py
+++ b/test/Scanner/FindPathDirs.py
@@ -71,7 +71,7 @@ test.write('SConstruct', """\
 SConscript('SConscript')
 """)
 
-test.write('SConscript', """\
+test.write('SConscript', r"""
 import os.path
 import re
 
@@ -86,7 +86,7 @@ def kfile_scan(node, env, path, arg):
     for inc in includes:
         for dir in path:
             file = str(dir) + os.sep + inc
-            if os.path.exists(file):  
+            if os.path.exists(file):
                 results.append(file)
                 break
     return results
@@ -109,7 +109,7 @@ env.Command('foo', 'foo.k', r'%(_python_)s build.py "$KPATH" $SOURCES $TARGET')
 
 
 
-test.write('foo.k', 
+test.write('foo.k',
 """foo.k 1 line 1
 include xxx
 include yyy
diff --git a/test/Scanner/Scanner.py b/test/Scanner/Scanner.py
index 272f26a..7e39134 100644
--- a/test/Scanner/Scanner.py
+++ b/test/Scanner/Scanner.py
@@ -60,7 +60,7 @@ test.write('SConstruct', """
 SConscript('SConscript')
 """, mode='w')
 
-test.write('SConscript', """
+test.write('SConscript', r"""
 import re
 
 include_re = re.compile(r'^include\s+(\S+)\s*$', re.M)
@@ -137,7 +137,7 @@ Alias('make_ork', ork)
 
 """ % locals(),mode='w')
 
-test.write('foo.k', 
+test.write('foo.k',
 """foo.k 1 line 1
 include xxx
 include yyy
@@ -151,7 +151,7 @@ bar.in 1 line 3
 include zzz
 """, mode='w')
 
-test.write('junk.k2', 
+test.write('junk.k2',
 """include yyy
 junk.k2 1 line 2
 junk.k2 1 line 3
diff --git a/test/Scanner/dictionary.py b/test/Scanner/dictionary.py
index efe3cd2..f80c7e5 100644
--- a/test/Scanner/dictionary.py
+++ b/test/Scanner/dictionary.py
@@ -61,7 +61,7 @@ test.write('SConstruct', """
 SConscript('SConscript')
 """)
 
-test.write('SConscript', """
+test.write('SConscript', r"""
 import re
 
 include1_re = re.compile(r'^include1\s+(\S+)$', re.M)
@@ -100,7 +100,7 @@ env.Command('bbb', 'bbb.k2', r'%(_python_)s build.py $SOURCES $TARGET')
 env.Command('ccc', 'ccc.k3', r'%(_python_)s build.py $SOURCES $TARGET')
 """ % locals())
 
-test.write('aaa.k1', 
+test.write('aaa.k1',
 """aaa.k1 1
 line 2
 include1 xxx
@@ -109,7 +109,7 @@ include3 zzz
 line 6
 """)
 
-test.write('bbb.k2', 
+test.write('bbb.k2',
 """bbb.k2 1
 line 2
 include1 xxx
@@ -118,7 +118,7 @@ include3 zzz
 line 6
 """)
 
-test.write('ccc.k3', 
+test.write('ccc.k3',
 """ccc.k3 1
 line 2
 include1 xxx
diff --git a/test/Scanner/exception.py b/test/Scanner/exception.py
index ec19842..90791cb 100644
--- a/test/Scanner/exception.py
+++ b/test/Scanner/exception.py
@@ -37,7 +37,7 @@ test.write('SConstruct', """
 SConscript('SConscript')
 """)
 
-test.write('SConscript', """
+test.write('SConscript', r"""
 import re
 
 include_re = re.compile(r'^include\s+(\S+)$', re.M)
@@ -82,14 +82,14 @@ bar_in = File('bar.in')
 env.Cat('bar', bar_in)
 """)
 
-test.write('foo.k', 
+test.write('foo.k',
 """foo.k 1 line 1
 include xxx
 include yyy
 foo.k 1 line 4
 """)
 
-test.write('bar.in', 
+test.write('bar.in',
 """include yyy
 bar.in 1 line 2
 bar.in 1 line 3
diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py
index 5e808e1..f0fb0cc 100644
--- a/test/Scanner/generated.py
+++ b/test/Scanner/generated.py
@@ -188,7 +188,7 @@ env = env.Clone()    # Yes, clobber intentionally
 
 """)
 
-test.write(['src', 'lib_geng', 'SConscript'], """\
+test.write(['src', 'lib_geng', 'SConscript'], r"""
 # --- Begin SConscript boilerplate ---
 import sys
 import Mylib
@@ -280,7 +280,7 @@ env.Command(generated_hdrs.split(),
             cmd_generated)
 recurse_env.Command([lib_fullname] + lib_objs,
                     lib_srcs + (generated_hdrs + " " + static_hdrs).split(),
-                    cmd_justlib) 
+                    cmd_justlib)
 """)
 
 test.write(['src', 'lib_geng', 'MAKE-HEADER.py'], """\
@@ -395,7 +395,7 @@ int g_1()
 
 test.write(['src', 'lib_geng', 'libg_2.c'], """\
 #include <libg_w.h>
-#include <libg_gx.h> 
+#include <libg_gx.h>
 #include <libg_gy.h>
 #include <libg_gz.h>
 
diff --git a/test/Scanner/multi-env.py b/test/Scanner/multi-env.py
index 1cc85d0..e9c231d 100644
--- a/test/Scanner/multi-env.py
+++ b/test/Scanner/multi-env.py
@@ -37,7 +37,7 @@ _python_ = TestSCons._python_
 test = TestSCons.TestSCons()
 
 
-test.write('SConstruct', """
+test.write('SConstruct', r"""
 import re
 
 include_re = re.compile(r'^include\s+(\S+)$', re.M)
diff --git a/test/Scanner/no-Dir-node.py b/test/Scanner/no-Dir-node.py
index a230ea6..ef90934 100644
--- a/test/Scanner/no-Dir-node.py
+++ b/test/Scanner/no-Dir-node.py
@@ -89,7 +89,7 @@ Command('list.out', 'subdir', foo, source_scanner = DirScanner)
 SConscript('subdir/SConscript')
 """)
 
-test.write(['subdir', 'SConscript'], """\
+test.write(['subdir', 'SConscript'], r"""
 import SCons.Scanner
 kscan = SCons.Scanner.Classic(name = 'kfile',
                               suffixes = ['.k'],
diff --git a/test/Scanner/source_scanner-dict.py b/test/Scanner/source_scanner-dict.py
index f719f00..115c19e 100644
--- a/test/Scanner/source_scanner-dict.py
+++ b/test/Scanner/source_scanner-dict.py
@@ -65,7 +65,7 @@ test.write('SConstruct', """
 SConscript('SConscript')
 """)
 
-test.write('SConscript', """
+test.write('SConscript', r"""
 import re
 
 include1_re = re.compile(r'^include1\s+(\S+)$', re.M)
@@ -101,7 +101,7 @@ env.Build('ccc', 'ccc.k3')
 env.Build('ddd', ['ddd.k4', 'aaa.k1', 'bbb.k2', 'ccc.k3'])
 """ % locals())
 
-test.write('aaa.k1', 
+test.write('aaa.k1',
 """aaa.k1 1
 line 2
 include1 xxx
@@ -110,7 +110,7 @@ include3 zzz
 line 6
 """)
 
-test.write('bbb.k2', 
+test.write('bbb.k2',
 """bbb.k2 1
 line 2
 include1 xxx
@@ -119,7 +119,7 @@ include3 zzz
 line 6
 """)
 
-test.write('ccc.k3', 
+test.write('ccc.k3',
 """ccc.k3 1
 line 2
 include1 xxx
@@ -128,7 +128,7 @@ include3 zzz
 line 6
 """)
 
-test.write('ddd.k4', 
+test.write('ddd.k4',
 """ddd.k4 1
 line 2
 line 3
diff --git a/test/Scanner/unicode.py b/test/Scanner/unicode.py
index 227c72e..0edd5b6 100644
--- a/test/Scanner/unicode.py
+++ b/test/Scanner/unicode.py
@@ -77,7 +77,7 @@ with open(sys.argv[2], 'w') as ofp:
 sys.exit(0)
 """)
 
-test.write('SConstruct', """
+test.write('SConstruct', r"""
 import re
 
 include_re = re.compile(r'^include\s+(\S+)$', re.M)
diff --git a/test/explain/basic.py b/test/explain/basic.py
index 1e42d33..46ce6bc 100644
--- a/test/explain/basic.py
+++ b/test/explain/basic.py
@@ -51,7 +51,7 @@ inc_bbb_k = test.workpath('inc', 'bbb.k')
 
 
 
-test.write(cat_py, r"""\
+test.write(cat_py, r"""
 from __future__ import print_function
 
 import sys
@@ -81,7 +81,7 @@ sys.exit(0)
 """)
 
 
-SConstruct_contents = """\
+SConstruct_contents = r"""
 DefaultEnvironment(tools=[])
 import re
 
@@ -130,7 +130,7 @@ AlwaysBuild(file6)
 env.Cat('subdir/file7', 'subdir/file7.in')
 env.OneCat('subdir/file8', ['subdir/file7.in', env.Value(%(test_value)s)] )
 env.OneCat('subdir/file9', ['subdir/file7.in', env.Value(7)] )
-""" % valueDict )
+""" % valueDict)
 
 test_value = '"first"'
 WriteInitialTest( locals() )
diff --git a/test/explain/save-info.py b/test/explain/save-info.py
index 383822c..24ebb88 100644
--- a/test/explain/save-info.py
+++ b/test/explain/save-info.py
@@ -70,7 +70,7 @@ with open(sys.argv[1], 'w') as ofp:
 sys.exit(0)
 """)
 
-test.write(['src', 'SConstruct'], """\
+test.write(['src', 'SConstruct'], r"""
 DefaultEnvironment(tools=[])
 import re
 
diff --git a/test/import.py b/test/import.py
index 9799850..2725705 100644
--- a/test/import.py
+++ b/test/import.py
@@ -114,8 +114,8 @@ scons: warning: Can't find Intel compiler top dir for version='None', abi='[^']*
 """ + TestSCons.file_expr
 
 # Intel no license directory warning
-intel_license_warning = re.escape("""
-scons: warning: Intel license dir was not found.  Tried using the INTEL_LICENSE_FILE environment variable (), the registry () and the default path (C:\Program Files\Common Files\Intel\Licenses).  Using the default path as a last resort.
+intel_license_warning = re.escape(
+r"""scons: warning: Intel license dir was not found.  Tried using the INTEL_LICENSE_FILE environment variable (), the registry () and the default path (C:\Program Files\Common Files\Intel\Licenses).  Using the default path as a last resort.
 """) + TestSCons.file_expr
 
 intel_warnings = [
diff --git a/test/option--tree.py b/test/option--tree.py
index 0bf2c06..1b34176 100644
--- a/test/option--tree.py
+++ b/test/option--tree.py
@@ -45,13 +45,6 @@ SCons Error: `foofoo' is not a valid --tree option type, try:
 """,
          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 that unicode characters can be printed (escaped) with the --tree option
 test.write('SConstruct',
diff --git a/test/option-v.py b/test/option-v.py
index 4a67df0..ed8c4e5 100644
--- a/test/option-v.py
+++ b/test/option-v.py
@@ -35,7 +35,7 @@ test.write('SConstruct', "")
 # Standard copyright marker is mangled so it doesn't get replaced
 # by the packaging build.
 copyright_line = """\
-(_{2}COPYRIGHT__|Copyright \\(c\\) 2001[-\d, ]+ The SCons Foundation)
+(_{2}COPYRIGHT__|Copyright \\(c\\) 2001[-\\d, ]+ The SCons Foundation)
 """
 
 # Windows may or may not print a line for the script version
@@ -64,7 +64,7 @@ if not test.match_re(stdout, expect1) and not test.match_re(stdout, expect2):
     test.fail_test()
 
 test.pass_test()
- 
+
 
 # Local Variables:
 # tab-width:4
diff --git a/test/packaging/rpm/explicit-target.py b/test/packaging/rpm/explicit-target.py
index 48b5c83..fba0237 100644
--- a/test/packaging/rpm/explicit-target.py
+++ b/test/packaging/rpm/explicit-target.py
@@ -67,7 +67,7 @@ env.Package( NAME           = 'foo',
              LICENSE        = 'gpl',
              SUMMARY        = 'balalalalal',
              X_RPM_GROUP    = 'Application/fu',
-             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --debug=tree --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
+             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --tree=all --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
              DESCRIPTION    = 'this should be really really long',
              source         = [ prog ],
              target         = "my_rpm_package.rpm",
diff --git a/test/packaging/rpm/multipackage.py b/test/packaging/rpm/multipackage.py
index 2f106f4..4a29a40 100644
--- a/test/packaging/rpm/multipackage.py
+++ b/test/packaging/rpm/multipackage.py
@@ -67,7 +67,7 @@ env.Package( NAME           = 'foo',
              LICENSE        = 'gpl',
              SUMMARY        = 'balalalalal',
              X_RPM_GROUP    = 'Application/fu',
-             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --debug=tree --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
+             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --tree=all --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
              DESCRIPTION    = 'this should be really really long',
              source         = [ prog ],
              SOURCE_URL     = 'http://foo.org/foo-1.2.3.tar.gz'
@@ -80,7 +80,7 @@ env.Package( NAME           = 'foo2',
              LICENSE        = 'gpl',
              SUMMARY        = 'balalalalal',
              X_RPM_GROUP    = 'Application/fu',
-             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --debug=tree --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
+             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --tree=all --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
              DESCRIPTION    = 'this should be really really long',
              source         = [ prog ],
         )
diff --git a/test/packaging/rpm/package.py b/test/packaging/rpm/package.py
index 23ebe05..0ef5fad 100644
--- a/test/packaging/rpm/package.py
+++ b/test/packaging/rpm/package.py
@@ -66,7 +66,7 @@ env.Package( NAME           = 'foo',
              LICENSE        = 'gpl',
              SUMMARY        = 'balalalalal',
              X_RPM_GROUP    = 'Application/fu',
-             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --debug=tree --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
+             X_RPM_INSTALL  = r'%(_python_)s %(scons)s --tree=all --install-sandbox="$RPM_BUILD_ROOT" "$RPM_BUILD_ROOT"',
              DESCRIPTION    = 'this should be really really long',
              source         = [ prog ],
              SOURCE_URL     = 'http://foo.org/foo-1.2.3.tar.gz'
diff --git a/test/runtest/xml/output.py b/test/runtest/xml/output.py
index 88bca04..cd20dbd 100644
--- a/test/runtest/xml/output.py
+++ b/test/runtest/xml/output.py
@@ -65,7 +65,7 @@ expect = """\
 </stdout>
       <stderr>FAILING TEST STDERR
 </stderr>
-      <time>\\d+\.\d</time>
+      <time>\\d+\\.\\d</time>
     </test>
     <test>
       <file_name>%(test_no_result_py)s</file_name>
@@ -75,7 +75,7 @@ expect = """\
 </stdout>
       <stderr>NO RESULT TEST STDERR
 </stderr>
-      <time>\\d+\.\d</time>
+      <time>\\d+\\.\\d</time>
     </test>
     <test>
       <file_name>%(test_pass_py)s</file_name>
@@ -85,9 +85,9 @@ expect = """\
 </stdout>
       <stderr>PASSING TEST STDERR
 </stderr>
-      <time>\\d+\.\d</time>
+      <time>\\d+\\.\\d</time>
     </test>
-  <time>\\d+\.\d</time>
+  <time>\\d+\\.\\d</time>
   </results>
 """ % locals()
 
diff --git a/test/srcchange.py b/test/srcchange.py
index e396fb8..f1f67c1 100644
--- a/test/srcchange.py
+++ b/test/srcchange.py
@@ -42,13 +42,13 @@ _python_ = TestSCons._python_
 
 test = TestSCons.TestSCons()
 
-test.write('getrevision', """
+test.write('getrevision', r"""
 from __future__ import print_function
-with open('revnum.in','r') as f:
+with open('revnum.in', 'r') as f:
     print(f.read().strip(), end='')
 """)
 
-test.write('SConstruct', """
+test.write('SConstruct', r"""
 import re
 
 def subrevision(target, source ,env):
@@ -63,7 +63,7 @@ SubRevision = Action(subrevision)
 
 env=Environment()
 content_env=env.Clone()
-content_env.Command('revision.in', [], r'%(_python_)s getrevision > $TARGET')
+content_env.Command('revision.in', [], '%(_python_)s getrevision > $TARGET')
 content_env.AlwaysBuild('revision.in')
 env.Precious('main.c')
 env.Command('main.c', 'revision.in', SubRevision)
diff --git a/test/timestamp-fallback.py b/test/timestamp-fallback.py
index f4e2e4d..2dd50a2 100644
--- a/test/timestamp-fallback.py
+++ b/test/timestamp-fallback.py
@@ -25,11 +25,14 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
-Verify falling back to 'timestamp' behavior if there is no native
-hashlib and no underlying md5 module available.
+Verify falling back to 'timestamp' behavior if there is no md5
+module. Formerly checked for hashlib first, but that has been
+standard library since 2.5; test is kept in case one of those
+rare no-md5 Pythons comes into play (some entities ban the use
+of md5 as unsafe, although SCons does not use it in a security context.
 """
 
-import imp
+import sys
 import os
 
 import TestSCons
@@ -37,24 +40,14 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 try:
-    file, name, desc = imp.find_module('hashlib')
+    from hashlib import md5
 except ImportError:
     pass
 else:
-    msg = "This version of Python has a 'hashlib' module.\n" + \
-          "Skipping test of falling back to timestamps.\n"
+    msg = "The 'md5' algorithm is built in to hashlib in this version of Python.\n" + \
+          "Cannot test falling back to timestamps.\n"
     test.skip_test(msg)
 
-try:
-    file, name, desc = imp.find_module('md5')
-except ImportError:
-    pass
-else:
-    if desc[2] == imp.C_BUILTIN:
-        msg = "The 'md5' module is built in to this version of Python.\n" + \
-              "Cannot test falling back to timestamps.\n"
-        test.skip_test(msg)
-
 test.write('md5.py', r"""
 raise ImportError
 """)
@@ -66,7 +59,7 @@ DefaultEnvironment(tools=[])
 
 def build(env, target, source):
     with open(str(target[0]), 'wt') as ofp, open(str(source[0]), 'rt') as ifp:
-        opf.write(ifp.read())
+        ofp.write(ifp.read())
 
 B = Builder(action = build)
 env = Environment(tools = [], BUILDERS = { 'B' : B })