Commit resolved conflicted merge.

36 files changed, 137 insertions, 99 deletions

diff --git a/test/Actions/pre-post.py b/test/Actions/pre-post.py
index 179e914..f6997e2 100644
--- a/test/Actions/pre-post.py
+++ b/test/Actions/pre-post.py
@@ -188,7 +188,7 @@ def post_action(target, source, env):
 env = Environment()
 o = env.Command(['pre-post', 'file.out'],
                 'file.in',
-                '%(_python_)s build.py ${TARGETS[1]} $SOURCE')
+                r'%(_python_)s build.py ${TARGETS[1]} $SOURCE')
 env.AddPreAction(o, pre_action)
 env.AddPostAction(o, post_action)
 """ % locals())
diff --git a/test/Builder/multi/different-environments.py b/test/Builder/multi/different-environments.py
index 783b7f9..c3e96c2 100644
--- a/test/Builder/multi/different-environments.py
+++ b/test/Builder/multi/different-environments.py
@@ -47,7 +47,7 @@ build(sys.argv[1],sys.argv[2],sys.argv[3:])
 """)
 
 test.write('SConstruct', """\
-B = Builder(action='%(_python_)s build.py $foo $TARGET $SOURCES', multi=1)
+B = Builder(action=r'%(_python_)s build.py $foo $TARGET $SOURCES', multi=1)
 env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'file03.out', source = 'file03a.in', foo=1)
 env.B(target = 'file03.out', source = 'file03b.in', foo=2)
diff --git a/test/Builder/multi/same-overrides.py b/test/Builder/multi/same-overrides.py
index 33c4e7b..ee169e4 100644
--- a/test/Builder/multi/same-overrides.py
+++ b/test/Builder/multi/same-overrides.py
@@ -45,7 +45,7 @@ build(sys.argv[1],sys.argv[2],sys.argv[3:])
 """)
 
 test.write('SConstruct', """\
-B = Builder(action='%(_python_)s build.py $foo $TARGET $SOURCES', multi=1)
+B = Builder(action=r'%(_python_)s build.py $foo $TARGET $SOURCES', multi=1)
 env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'file4.out', source = 'file4a.in', foo=3)
 env.B(target = 'file4.out', source = 'file4b.in', foo=3)
diff --git a/test/Builder/srcdir.py b/test/Builder/srcdir.py
index 63732d7..669c5e1 100644
--- a/test/Builder/srcdir.py
+++ b/test/Builder/srcdir.py
@@ -50,7 +50,7 @@ o.close()
 test.write(['src', 'SConstruct'], """\
 Command('output',
         ['file1', File('file2'), r'%(file3)s', 'file4'],
-        '%(_python_)s cat.py $TARGET $SOURCES',
+        r'%(_python_)s cat.py $TARGET $SOURCES',
         srcdir='foo')
 """ % locals())
 
diff --git a/test/CacheDir/CacheDir.py b/test/CacheDir/CacheDir.py
index 9abe0e0..4c05634 100644
--- a/test/CacheDir/CacheDir.py
+++ b/test/CacheDir/CacheDir.py
@@ -82,7 +82,8 @@ test.must_not_exist(src_aaa_out)
 test.must_not_exist(src_bbb_out)
 test.must_not_exist(src_ccc_out)
 test.must_not_exist(src_all)
-test.fail_test(len(os.listdir(cache)))
+# Even if you do -n, the cache will be configured.
+test.fail_test(os.listdir(cache) != ['config'])
 
 # Verify that a normal build works correctly, and clean up.
 # This should populate the cache with our derived files.
diff --git a/test/CacheDir/environment.py b/test/CacheDir/environment.py
index 4fb9b51..1378bb2 100644
--- a/test/CacheDir/environment.py
+++ b/test/CacheDir/environment.py
@@ -85,7 +85,8 @@ test.must_not_exist(src_aaa_out)
 test.must_not_exist(src_bbb_out)
 test.must_not_exist(src_ccc_out)
 test.must_not_exist(src_all)
-test.fail_test(len(os.listdir(cache)))
+# Even if you do -n, the cache will be configured.
+test.fail_test(os.listdir(cache) != ['config'])
 
 # Verify that a normal build works correctly, and clean up.
 # This should populate the cache with our derived files.
diff --git a/test/CacheDir/option--cs.py b/test/CacheDir/option--cs.py
index b6bb52a..6d22814 100644
--- a/test/CacheDir/option--cs.py
+++ b/test/CacheDir/option--cs.py
@@ -35,6 +35,7 @@ import shutil
 import TestSCons
 
 _python_ = TestSCons._python_
+
 _exe = TestSCons._exe
 _obj = TestSCons._obj
 
@@ -62,7 +63,7 @@ def cat(env, source, target):
         f.write(open(str(src), "rb").read())
     f.close()
 env = Environment(BUILDERS={'Internal':Builder(action=cat),
-                            'External':Builder(action='%(_python_)s build.py $TARGET $SOURCES')})
+                            'External':Builder(action=r'%(_python_)s build.py $TARGET $SOURCES')})
 env.External('aaa.out', 'aaa.in')
 env.External('bbb.out', 'bbb.in')
 env.Internal('ccc.out', 'ccc.in')
diff --git a/test/Command.py b/test/Command.py
index 74046b1..5f72c94 100644
--- a/test/Command.py
+++ b/test/Command.py
@@ -63,15 +63,15 @@ def sub(env, target, source):
     t.close()
     return 0
 
-env = Environment(COPY_THROUGH_TEMP = '%(_python_)s build.py .tmp $SOURCE\\n%(_python_)s build.py $TARGET .tmp',
+env = Environment(COPY_THROUGH_TEMP = r'%(_python_)s build.py .tmp $SOURCE' + '\\n' + r'%(_python_)s build.py $TARGET .tmp',
                   EXPAND = '$COPY_THROUGH_TEMP')
 env.Command(target = 'f1.out', source = 'f1.in',
             action = buildIt)
 env.Command(target = 'f2.out', source = 'f2.in',
             action = r'%(_python_)s build.py temp2 $SOURCES' + '\\n' + r'%(_python_)s build.py $TARGET temp2')
 env.Command(target = 'f3.out', source = 'f3.in',
-            action = [ [ r'%(python)s', 'build.py', 'temp3', '$SOURCES' ],
-                       [ r'%(python)s', 'build.py', '$TARGET', 'temp3'] ])
+            action = [ [ r'%(_python_)s', 'build.py', 'temp3', '$SOURCES' ],
+                       [ r'%(_python_)s', 'build.py', '$TARGET', 'temp3'] ])
 Command(target = 'f4.out', source = 'sub', action = sub)
 env.Command(target = 'f5.out', source = 'f5.in', action = buildIt,
             XYZZY='XYZZY is set')
diff --git a/test/Configure/Builder-call.py b/test/Configure/Builder-call.py
index 037a2c7..b85b039 100644
--- a/test/Configure/Builder-call.py
+++ b/test/Configure/Builder-call.py
@@ -48,7 +48,7 @@ def CustomTest(*args):
     return 0
 conf = env.Configure(custom_tests = {'MyTest' : CustomTest})
 if not conf.MyTest():
-    env.Command("hello", [], '%(_python_)s mycommand.py $TARGET')
+    env.Command("hello", [], r'%(_python_)s mycommand.py $TARGET')
 env = conf.Finish()
 """ % locals())
 
diff --git a/test/Configure/custom-tests.py b/test/Configure/custom-tests.py
index 687ba48..503eb4e 100644
--- a/test/Configure/custom-tests.py
+++ b/test/Configure/custom-tests.py
@@ -63,8 +63,8 @@ def CheckCustom(test):
     retLinkFAIL                 = test.TryLink( '%(linkFAIL)s', '.c' )
     (retRunOK, outputRunOK)     = test.TryRun( '%(runOK)s', '.c' )
     (retRunFAIL, outputRunFAIL) = test.TryRun( '%(runFAIL)s', '.c' )
-    (retActOK, outputActOK) = test.TryAction( '%(_python_)s pyAct.py 0 > $TARGET' )
-    (retActFAIL, outputActFAIL) = test.TryAction( '%(_python_)s pyAct.py 1 > $TARGET' )
+    (retActOK, outputActOK) = test.TryAction( r'%(_python_)s pyAct.py 0 > $TARGET' )
+    (retActFAIL, outputActFAIL) = test.TryAction( r'%(_python_)s pyAct.py 1 > $TARGET' )
     resOK = retCompileOK and retLinkOK and retRunOK and outputRunOK=="Hello"
     resOK = resOK and retActOK and int(outputActOK)==0
     resFAIL = retCompileFAIL or retLinkFAIL or retRunFAIL or outputRunFAIL!=""
diff --git a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py
index d5af0ea..8ff4ced 100644
--- a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py
+++ b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py
@@ -74,7 +74,7 @@ def cat(env, source, target):
     f.close()
 env = Environment(TOOLS = ['default', 'BitKeeper'],
                   BUILDERS={'Cat':Builder(action=cat)},
-                  BITKEEPERCOM='%(_python_)s my-bk-get.py $TARGET')
+                  BITKEEPERCOM=r'%(_python_)s my-bk-get.py $TARGET')
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
diff --git a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py
index ef70cb8..5bbdea2 100644
--- a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py
+++ b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py
@@ -74,7 +74,7 @@ def cat(env, source, target):
     f.close()
 env = Environment(tools = ['default', 'BitKeeper'],
                   BUILDERS={'Cat':Builder(action=cat)},
-                  BITKEEPERCOM='%(_python_)s my-bk-get.py $TARGET',
+                  BITKEEPERCOM=r'%(_python_)s my-bk-get.py $TARGET',
                   BITKEEPERCOMSTR='Checking out $TARGET from our fake BitKeeper')
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
diff --git a/test/Deprecated/SourceCode/CVS/CVSCOM.py b/test/Deprecated/SourceCode/CVS/CVSCOM.py
index a0f8400..f3bd29d 100644
--- a/test/Deprecated/SourceCode/CVS/CVSCOM.py
+++ b/test/Deprecated/SourceCode/CVS/CVSCOM.py
@@ -74,7 +74,7 @@ def cat(env, source, target):
     f.close()
 env = Environment(TOOLS = ['default', 'CVS'],
                   BUILDERS={'Cat':Builder(action=cat)},
-                  CVSCOM='%(_python_)s my-cvs-co-.py $TARGET')
+                  CVSCOM=r'%(_python_)s my-cvs-co-.py $TARGET')
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
diff --git a/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py b/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py
index f793d66..483a0ae 100644
--- a/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py
+++ b/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py
@@ -74,7 +74,7 @@ def cat(env, source, target):
     f.close()
 env = Environment(TOOLS = ['default', 'CVS'],
                   BUILDERS={'Cat':Builder(action=cat)},
-                  CVSCOM='%(_python_)s my-cvs-co.py $TARGET',
+                  CVSCOM=r'%(_python_)s my-cvs-co.py $TARGET',
                   CVSCOMSTR='Checking out $TARGET from our fake CVS')
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
diff --git a/test/Deprecated/SourceCode/Perforce/P4COM.py b/test/Deprecated/SourceCode/Perforce/P4COM.py
index 9b9bab1..e58cb60 100644
--- a/test/Deprecated/SourceCode/Perforce/P4COM.py
+++ b/test/Deprecated/SourceCode/Perforce/P4COM.py
@@ -74,7 +74,7 @@ def cat(env, source, target):
     f.close()
 env = Environment(TOOLS = ['default', 'Perforce'],
                   BUILDERS={'Cat':Builder(action=cat)},
-                  P4COM='%(_python_)s my-p4.py $TARGET')
+                  P4COM=r'%(_python_)s my-p4.py $TARGET')
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
diff --git a/test/Deprecated/SourceCode/Perforce/P4COMSTR.py b/test/Deprecated/SourceCode/Perforce/P4COMSTR.py
index 7a24021..7b2fbba 100644
--- a/test/Deprecated/SourceCode/Perforce/P4COMSTR.py
+++ b/test/Deprecated/SourceCode/Perforce/P4COMSTR.py
@@ -75,7 +75,7 @@ def cat(env, source, target):
     f.close()
 env = Environment(TOOLS = ['default', 'Perforce'],
                   BUILDERS={'Cat':Builder(action=cat)},
-                  P4COM='%(_python_)s my-p4.py $TARGET',
+                  P4COM=r'%(_python_)s my-p4.py $TARGET',
                   P4COMSTR='Checking out $TARGET from our fake Perforce')
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
diff --git a/test/Deprecated/SourceCode/RCS/RCS_COCOM.py b/test/Deprecated/SourceCode/RCS/RCS_COCOM.py
index 765c88c..c5934ac 100644
--- a/test/Deprecated/SourceCode/RCS/RCS_COCOM.py
+++ b/test/Deprecated/SourceCode/RCS/RCS_COCOM.py
@@ -74,7 +74,7 @@ def cat(env, source, target):
     f.close()
 env = Environment(TOOLS = ['default', 'RCS'],
                   BUILDERS={'Cat':Builder(action=cat)},
-                  RCS_COCOM='%(_python_)s my-rcs-co.py $TARGET')
+                  RCS_COCOM=r'%(_python_)s my-rcs-co.py $TARGET')
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
diff --git a/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py b/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py
index 57088fa..cb54202 100644
--- a/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py
+++ b/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py
@@ -74,7 +74,7 @@ def cat(env, source, target):
     f.close()
 env = Environment(TOOLS = ['default', 'RCS'],
                   BUILDERS={'Cat':Builder(action=cat)},
-                  RCS_COCOM='%(_python_)s my-rcs-co.py $TARGET',
+                  RCS_COCOM=r'%(_python_)s my-rcs-co.py $TARGET',
                   RCS_COCOMSTR='Checking out $TARGET from our fake RCS')
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
diff --git a/test/Deprecated/SourceCode/SCCS/SCCSCOM.py b/test/Deprecated/SourceCode/SCCS/SCCSCOM.py
index 6ad02ac..ba89d87 100644
--- a/test/Deprecated/SourceCode/SCCS/SCCSCOM.py
+++ b/test/Deprecated/SourceCode/SCCS/SCCSCOM.py
@@ -74,7 +74,7 @@ def cat(env, source, target):
     f.close()
 env = Environment(TOOLS = ['default', 'SCCS'],
                   BUILDERS={'Cat':Builder(action=cat)},
-                  SCCSCOM='%(_python_)s my-sccs-get.py $TARGET')
+                  SCCSCOM=r'%(_python_)s my-sccs-get.py $TARGET')
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
diff --git a/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py b/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py
index a757495..2351c05 100644
--- a/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py
+++ b/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py
@@ -74,7 +74,7 @@ def cat(env, source, target):
     f.close()
 env = Environment(tools = ['default', 'SCCS'],
                   BUILDERS={'Cat':Builder(action=cat)},
-                  SCCSCOM='%(_python_)s my-sccs-get.py $TARGET',
+                  SCCSCOM=r'%(_python_)s my-sccs-get.py $TARGET',
                   SCCSCOMSTR='Checking out $TARGET from our fake SCCS')
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
diff --git a/test/ESCAPE.py b/test/ESCAPE.py
index 0651b92..819d60b 100644
--- a/test/ESCAPE.py
+++ b/test/ESCAPE.py
@@ -51,7 +51,7 @@ def my_escape(s):
     s = s.replace('file.in', 'file.xxx')
     return orig_escape(s)
 env = Environment(ESCAPE = my_escape)
-env.Command('file.out', 'file.in', '%(_python_)s cat.py $TARGET $SOURCES')
+env.Command('file.out', 'file.in', r'%(_python_)s cat.py $TARGET $SOURCES')
 """ % locals())
 
 test.write('file.in', "file.in\n")
diff --git a/test/Execute.py b/test/Execute.py
index 2e53444..e63cad5 100644
--- a/test/Execute.py
+++ b/test/Execute.py
@@ -45,18 +45,18 @@ sys.exit(exitval)
 """)
 
 test.write('SConstruct', """\
-Execute('%(_python_)s my_copy.py a.in a.out')
-Execute(Action('%(_python_)s my_copy.py b.in b.out'))
+Execute(r'%(_python_)s my_copy.py a.in a.out')
+Execute(Action(r'%(_python_)s my_copy.py b.in b.out'))
 env = Environment(COPY = 'my_copy.py')
-env.Execute('%(_python_)s my_copy.py c.in c.out')
-env.Execute(Action('%(_python_)s my_copy.py d.in d.out'))
-v = env.Execute('%(_python_)s $COPY e.in e.out')
+env.Execute(r'%(_python_)s my_copy.py c.in c.out')
+env.Execute(Action(r'%(_python_)s my_copy.py d.in d.out'))
+v = env.Execute(r'%(_python_)s $COPY e.in e.out')
 assert v == 0, v
-v = env.Execute(Action('%(_python_)s $COPY f.in f.out'))
+v = env.Execute(Action(r'%(_python_)s $COPY f.in f.out'))
 assert v == 0, v
-v = env.Execute('%(_python_)s $COPY g.in g.out 1')
+v = env.Execute(r'%(_python_)s $COPY g.in g.out 1')
 assert v == 1, v
-v = env.Execute(Action('%(_python_)s $COPY h.in h.out 2'))
+v = env.Execute(Action(r'%(_python_)s $COPY h.in h.out 2'))
 assert v == 2, v
 import shutil
 Execute(lambda target, source, env: shutil.copy('i.in', 'i.out'))
diff --git a/test/MSVC/batch.py b/test/MSVC/batch.py
index fbb3218..8648292 100644
--- a/test/MSVC/batch.py
+++ b/test/MSVC/batch.py
@@ -72,8 +72,8 @@ for infile in sys.argv[2:]:
 """)
 
 test.write('SConstruct', """
-cccom = '%(_python_)s fake_cl.py $_MSVC_OUTPUT_FLAG $CHANGED_SOURCES'
-linkcom = '%(_python_)s fake_link.py ${TARGET.windows} $SOURCES'
+cccom = r'%(_python_)s fake_cl.py $_MSVC_OUTPUT_FLAG $CHANGED_SOURCES'
+linkcom = r'%(_python_)s fake_link.py ${TARGET.windows} $SOURCES'
 env = Environment(tools=['msvc', 'mslink'],
                   CCCOM=cccom, 
                   LINKCOM=linkcom,
diff --git a/test/Parallel/duplicate-children.py b/test/Parallel/duplicate-children.py
index c6c5c29..8b8f4cd 100644
--- a/test/Parallel/duplicate-children.py
+++ b/test/Parallel/duplicate-children.py
@@ -53,8 +53,8 @@ test.write('SConstruct', """
 # Test case for SCons issue #1608
 # Create a file "foo.in" in the current directory before running scons.
 env = Environment()
-env.Command('foo.out', ['foo.in'], '%(_python_)s cat.py $TARGET $SOURCE && %(_python_)s sleep.py 3')
-env.Command('foobar', ['foo.out'], '%(_python_)s cat.py $TARGET $SOURCES')
+env.Command('foo.out', ['foo.in'], r'%(_python_)s cat.py $TARGET $SOURCE && %(_python_)s sleep.py 3')
+env.Command('foobar', ['foo.out'], r'%(_python_)s cat.py $TARGET $SOURCES')
 env.Depends('foobar', 'foo.out')
 """ % locals())
 
diff --git a/test/SConsignFile/default.py b/test/SConsignFile/default.py
index f38aec8..4d56a5e 100644
--- a/test/SConsignFile/default.py
+++ b/test/SConsignFile/default.py
@@ -49,7 +49,7 @@ sys.exit(0)
 #
 test.write('SConstruct', """
 SConsignFile()
-B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES')
+B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES')
 env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'f1.out', source = 'f1.in')
 env.B(target = 'f2.out', source = 'f2.in')
diff --git a/test/SConsignFile/explicit-file.py b/test/SConsignFile/explicit-file.py
index 33963c2..90c2241 100644
--- a/test/SConsignFile/explicit-file.py
+++ b/test/SConsignFile/explicit-file.py
@@ -49,7 +49,7 @@ file.close()
 test.write('SConstruct', """
 e = Environment(XXX = 'scons')
 e.SConsignFile('my_${XXX}ign')
-B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES')
+B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES')
 env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'f5.out', source = 'f5.in')
 env.B(target = 'f6.out', source = 'f6.in')
diff --git a/test/SConsignFile/use-dbhash.py b/test/SConsignFile/use-dbhash.py
index bd9b799..f70c8b0 100644
--- a/test/SConsignFile/use-dbhash.py
+++ b/test/SConsignFile/use-dbhash.py
@@ -55,7 +55,7 @@ test.write('SConstruct', """
 import sys
 import dbhash
 SConsignFile('.sconsign', dbhash)
-B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES')
+B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES')
 env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'f1.out', source = 'f1.in')
 env.B(target = 'f2.out', source = 'f2.in')
diff --git a/test/SConsignFile/use-dumbdbm.py b/test/SConsignFile/use-dumbdbm.py
index 84f1dd4..02a52da 100644
--- a/test/SConsignFile/use-dumbdbm.py
+++ b/test/SConsignFile/use-dumbdbm.py
@@ -55,7 +55,7 @@ test.write('SConstruct', """
 import sys
 import dumbdbm
 SConsignFile('.sconsign', dumbdbm)
-B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES')
+B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES')
 env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'f1.out', source = 'f1.in')
 env.B(target = 'f2.out', source = 'f2.in')
diff --git a/test/file-names.py b/test/file-names.py
index 95b4e4e..d9f9c63 100644
--- a/test/file-names.py
+++ b/test/file-names.py
@@ -24,6 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import sys
 import TestSCons
 
 test = TestSCons.TestSCons()
@@ -38,56 +39,90 @@ test = TestSCons.TestSCons()
 # parsing and interpretation of redirection and piping.  But that
 # means we have to find ways to work with *all* of their quoting
 # conventions.
-#
-# Until we sort that all out, short-circuit this test so we can
-# check it in and avoid having to re-invent this wheel later.
-test.pass_test()
 
 def contents(c):
     return "|" + c + "|\n"
 
+invalid_chars = '/\0'
+
 if sys.platform == 'win32':
-    def bad_char(c):
-        return c in '/\\:'
-else:
-    def bad_char(c):
-        return c in '/'
+    invalid_chars = set(invalid_chars)
 
-# Only worry about ASCII characters right now.
-# Someone with more Unicode knowledge should enhance this later.
-for i in range(1, 255):
-    c = chr(i)
-    if not bad_char(c):
-        test.write("in" + c + "in", contents(c))
+    # See the 'naming conventions' section of
+    # https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx
+    invalid_chars.update([ chr(c) for c in range(32) ])
+    invalid_chars.update(r'\/:*?"<>|')
+    invalid_chars.update(chr(127))
 
-test.write('SConstruct', r"""
-import sys
-if sys.platform == 'win32':
+    # Win32 filesystems are case insensitive so don't do half the alphabet.
+    import string
+    invalid_chars.update(string.lowercase)
+
+    # See the 'naming conventions' section of
+    # https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx
     def bad_char(c):
-        return (c == '/' or c == '\\' or c == ':')
+        return c in invalid_chars
+    def invalid_leading_char(c):
+        # the hash character as a leading character is interpreted to mean the project root
+        return c in ' #'
+    def invalid_trailing_char(c):
+        return c in ' .'
+    commandString = "copy $SOURCE $TARGET"
 else:
+    invalid_chars = set(invalid_chars)
+    invalid_chars.add(chr(10))
+    invalid_chars.add(chr(13))
+    invalid_chars.add(chr(92)) # forward slash (dirsep)
+    invalid_chars.add(chr(96)) # backtick
+
+    
     def bad_char(c):
-        return (c == '/')
-env = Environment()
-for i in range(1, 255):
-    c = chr(i)
-    if not bad_char(c):
-        if c in '$':
-            c = '\\' + c
-        infile = "in" + c + "in"
-        env.Command(c + "out", infile, "cp $SOURCE $TARGET")
-        env.Command("out" + c + "out", infile, "cp $SOURCE $TARGET")
-        env.Command("out" + c, infile, "cp $SOURCE $TARGET")
-""")
+        return c in invalid_chars
+    def invalid_leading_char(c):
+        # the hash character as a leading character is interpreted to mean the project root
+        return c in '#'
+    def invalid_trailing_char(c):
+        return False
+    commandString = "cp $SOURCE $TARGET"
+
+goodChars = [ chr(c) for c in range(1, 128) if not bad_char(chr(c)) ]
+
+def get_filename(ftype,c):
+    return ftype+"%d"%ord(c[-1])+c+ftype
+
+for c in goodChars:
+    test.write(get_filename("in",c), contents(c))
+
+def create_command(a, b, c):
+    a = ('', 'out')[a]
+    b = ('', 'out')[b]
+    return 'env.Command("' + a + get_filename('',c) + b + '", "'+get_filename("in",c)+ '","' + commandString + '")'
+
+sconstruct = [ 'import sys', 'env = Environment()' ]
+for c in goodChars:
+    if c == '$':
+        c = '$$'
+    if c == '"':
+        c = r'\"'
+    infile = get_filename("in",c)
+    if not invalid_leading_char(c):
+        sconstruct.append(create_command(False, True, c))
+    sconstruct.append(create_command(True, True, c))
+    if not invalid_trailing_char(c):
+        sconstruct.append(create_command(True, False, c))
+test.write('SConstruct', '\n'.join(sconstruct))
 
 test.run(arguments = '.')
 
-for i in range(1, 255):
-    c = chr(i)
-    if not bad_char(c):
-        test.fail_test(test.read(c + "out") != contents(c))
-        test.fail_test(test.read("out" + c + "out") != contents(c))
-        test.fail_test(test.read("out" + c) != contents(c))
+for c in goodChars:
+#    print "Checking %d "%ord(c)
+
+    c_str = ("%d"%ord(c[-1]))+c
+    if not invalid_leading_char(c):
+        test.fail_test(test.read(c_str + "out") != contents(c))
+    test.fail_test(test.read("out" + c_str + "out") != contents(c))
+    if not invalid_trailing_char(c):
+        test.fail_test(test.read("out" + c_str) != contents(c))
 
 test.pass_test()
 
diff --git a/test/ignore-command.py b/test/ignore-command.py
index 1343145..9fd24ab 100644
--- a/test/ignore-command.py
+++ b/test/ignore-command.py
@@ -49,13 +49,13 @@ sys.exit(1)
 
 test.write('SConstruct', """\
 env = Environment()
-f1 = env.Command('f1.out', 'f1.in', '%(_python_)s build.py $TARGET $SOURCE')
-f2 = env.Command('f2.out', 'f2.in', '-%(_python_)s build.py $TARGET $SOURCE')
-f3 = env.Command('f3.out', 'f3.in', '- %(_python_)s build.py $TARGET $SOURCE')
-f4 = env.Command('f4.out', 'f4.in', '@-%(_python_)s build.py $TARGET $SOURCE')
-f5 = env.Command('f5.out', 'f5.in', '@- %(_python_)s build.py $TARGET $SOURCE')
-f6 = env.Command('f6.out', 'f6.in', '-@%(_python_)s build.py $TARGET $SOURCE')
-f7 = env.Command('f7.out', 'f7.in', '-@ %(_python_)s build.py $TARGET $SOURCE')
+f1 = env.Command('f1.out', 'f1.in', r'%(_python_)s build.py $TARGET $SOURCE')
+f2 = env.Command('f2.out', 'f2.in', r'-%(_python_)s build.py $TARGET $SOURCE')
+f3 = env.Command('f3.out', 'f3.in', r'- %(_python_)s build.py $TARGET $SOURCE')
+f4 = env.Command('f4.out', 'f4.in', r'@-%(_python_)s build.py $TARGET $SOURCE')
+f5 = env.Command('f5.out', 'f5.in', r'@- %(_python_)s build.py $TARGET $SOURCE')
+f6 = env.Command('f6.out', 'f6.in', r'-@%(_python_)s build.py $TARGET $SOURCE')
+f7 = env.Command('f7.out', 'f7.in', r'-@ %(_python_)s build.py $TARGET $SOURCE')
 Default(f2, f3, f4, f5, f6, f7)
 """ % locals())
 
diff --git a/test/option/debug-findlibs.py b/test/option/debug-findlibs.py
index ce97199..9d5c82a 100644
--- a/test/option/debug-findlibs.py
+++ b/test/option/debug-findlibs.py
@@ -47,7 +47,7 @@ env = Environment(OBJSUFFIX = '.ooo', PROGSUFFIX = '.xxx',
                   LIBS = ['iii', 'jjj', 'kkk', 'lll', 'mmm'],
                   LIBPREFIXES = ['a-', 'b-', 'c-'],
                   LIBSUFFIXES = ['.aaa', '.bbb', '.ccc'],
-                  LINKCOM = '%(_python_)s cat.py $TARGET $SOURCES')
+                  LINKCOM = r'%(_python_)s cat.py $TARGET $SOURCES')
 env.Program('foo', 'a.ooo',)
 """ % locals())
 
diff --git a/test/redirection.py b/test/redirection.py
index 55ffeae..98bfc04 100644
--- a/test/redirection.py
+++ b/test/redirection.py
@@ -43,13 +43,13 @@ sys.exit(0)
 test.write('SConstruct', r"""
 env = Environment()
 env.Command(target='foo1', source='bar1',
-            action= '%(_python_)s cat.py $SOURCES > $TARGET')
+            action= r'%(_python_)s cat.py $SOURCES > $TARGET')
 env.Command(target='foo2', source='bar2',
-            action= '%(_python_)s cat.py < $SOURCES > $TARGET')
+            action= r'%(_python_)s cat.py < $SOURCES > $TARGET')
 env.Command(target='foo3', source='bar3',
-            action='%(_python_)s cat.py $SOURCES | %(_python_)s cat.py > $TARGET')
+            action=r'%(_python_)s cat.py $SOURCES | %(_python_)s cat.py > $TARGET')
 env.Command(target='foo4', source='bar4',
-            action='%(_python_)s cat.py <$SOURCES |%(_python_)s cat.py >$TARGET')
+            action=r'%(_python_)s cat.py <$SOURCES |%(_python_)s cat.py >$TARGET')
 """ % locals())
 
 test.write('bar1', 'bar1\r\n')
diff --git a/test/silent-command.py b/test/silent-command.py
index 7704ee5..b0e4a2e 100644
--- a/test/silent-command.py
+++ b/test/silent-command.py
@@ -48,13 +48,13 @@ fp.close()
 
 test.write('SConstruct', """\
 env = Environment()
-env.Command('f1.out', 'f1.in', '%(_python_)s build.py $TARGET $SOURCE')
-env.Command('f2.out', 'f2.in', '@%(_python_)s build.py $TARGET $SOURCE')
-env.Command('f3.out', 'f3.in', '@ %(_python_)s build.py $TARGET $SOURCE')
-env.Command('f4.out', 'f4.in', '@-%(_python_)s build.py $TARGET $SOURCE')
-env.Command('f5.out', 'f5.in', '@- %(_python_)s build.py $TARGET $SOURCE')
-env.Command('f6.out', 'f6.in', '-@%(_python_)s build.py $TARGET $SOURCE')
-env.Command('f7.out', 'f7.in', '-@ %(_python_)s build.py $TARGET $SOURCE')
+env.Command('f1.out', 'f1.in', r'%(_python_)s build.py $TARGET $SOURCE')
+env.Command('f2.out', 'f2.in', r'@%(_python_)s build.py $TARGET $SOURCE')
+env.Command('f3.out', 'f3.in', r'@ %(_python_)s build.py $TARGET $SOURCE')
+env.Command('f4.out', 'f4.in', r'@-%(_python_)s build.py $TARGET $SOURCE')
+env.Command('f5.out', 'f5.in', r'@- %(_python_)s build.py $TARGET $SOURCE')
+env.Command('f6.out', 'f6.in', r'-@%(_python_)s build.py $TARGET $SOURCE')
+env.Command('f7.out', 'f7.in', r'-@ %(_python_)s build.py $TARGET $SOURCE')
 """ % locals())
 
 test.write('f1.in', "f1.in\n")
diff --git a/test/special-filenames.py b/test/special-filenames.py
index 00e4a3d..de09a52 100644
--- a/test/special-filenames.py
+++ b/test/special-filenames.py
@@ -69,7 +69,7 @@ def buildFileStr(fn):
 xxx = '\n'.join(map(buildFileStr, file_names))
 
 test.write("SConstruct", """
-env=Environment(BUILDERS = {'Build' : Builder(action = '%(_python_)s cat.py $TARGET $SOURCE')})
+env=Environment(BUILDERS = {'Build' : Builder(action = r'%(_python_)s cat.py $TARGET $SOURCE')})
 
 %(xxx)s
 """ % locals())
diff --git a/test/srcchange.py b/test/srcchange.py
index d181297..f2fde91 100644
--- a/test/srcchange.py
+++ b/test/srcchange.py
@@ -63,7 +63,7 @@ SubRevision = Action(subrevision)
 
 env=Environment()
 content_env=env.Clone()
-content_env.Command('revision.in', [], '%(_python_)s getrevision > $TARGET')
+content_env.Command('revision.in', [], r'%(_python_)s getrevision > $TARGET')
 content_env.AlwaysBuild('revision.in')
 env.Precious('main.c')
 env.Command('main.c', 'revision.in', SubRevision)
diff --git a/test/subdir.py b/test/subdir.py
index fa10cff..22d0912 100644
--- a/test/subdir.py
+++ b/test/subdir.py
@@ -42,7 +42,7 @@ file.close()
 """)
 
 test.write('SConstruct', """
-B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES')
+B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES')
 env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'subdir/f1.out', source = 'subdir/f1.in')
 env.B(target = 'subdir/f2.out', source = 'subdir/f2.in')