win32 test portability fixes (Anthony Roach)

9 files changed, 15 insertions, 18 deletions

diff --git a/test/AS.py b/test/AS.py
index 97ad0ce..b25a1b6 100644
--- a/test/AS.py
+++ b/test/AS.py
@@ -167,8 +167,7 @@ test.fail_test(test.read('test5' + _exe) != "This is a .spp file.\n")
 test.fail_test(test.read('test6' + _exe) != "This is a .SPP file.\n")
 
 
-
-as = test.where_is('as')
+as = test.detect('AS', 'as')
 
 if as:
 
diff --git a/test/RANLIB.py b/test/RANLIB.py
index 14708e0..04a084f 100644
--- a/test/RANLIB.py
+++ b/test/RANLIB.py
@@ -39,7 +39,7 @@ else:
 
 test = TestSCons.TestSCons()
 
-ranlib = test.where_is('ranlib')
+ranlib = test.detect('RANLIB', 'ranlib')
 
 test.no_result(not ranlib)
 
diff --git a/test/RANLIBFLAGS.py b/test/RANLIBFLAGS.py
index b3e9451..80aaf16 100644
--- a/test/RANLIBFLAGS.py
+++ b/test/RANLIBFLAGS.py
@@ -38,7 +38,7 @@ else:
 
 test = TestSCons.TestSCons()
 
-ranlib = test.where_is('ranlib')
+ranlib = test.detect('RANLIB', 'ranlib')
 
 test.no_result(not ranlib)
 
diff --git a/test/Scanner.py b/test/Scanner.py
index 9608899..461f414 100644
--- a/test/Scanner.py
+++ b/test/Scanner.py
@@ -73,10 +73,10 @@ kscan = Scanner(name = 'kfile',
 scanners = Environment().Dictionary('SCANNERS')
 env = Environment(SCANNERS = scanners + [kscan])
 
-env.Command('foo', 'foo.k', '%s build.py $SOURCES $TARGET')
+env.Command('foo', 'foo.k', r'%s build.py $SOURCES $TARGET')
 
 bar_in = File('bar.in')
-env.Command('bar', bar_in, '%s build.py $SOURCES  $TARGET')
+env.Command('bar', bar_in, r'%s build.py $SOURCES  $TARGET')
 bar_in.source_scanner = kscan
 """ % (python, python))
 
diff --git a/test/TAR.py b/test/TAR.py
index ee9e7d4..fbfacf6 100644
--- a/test/TAR.py
+++ b/test/TAR.py
@@ -82,8 +82,7 @@ test.run(arguments = 'bbb.tar', stderr = None)
 test.fail_test(test.read('bbb.tar') != "sub1/file5\nsub1/file6\nfile4\n")
 
 
-
-tar = test.where_is('tar')
+tar = test.detect('TAR', 'tar')
 
 if tar:
 
@@ -95,9 +94,9 @@ os.system(string.join(sys.argv[1:], " "))
 """ % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
 
     test.write('SConstruct', """
-foo = Environment(tools = ['tar'])
+foo = Environment()
 tar = foo.Dictionary('TAR')
-bar = Environment(tools = ['tar'], TAR = r'%s wrapper.py ' + tar)
+bar = Environment(TAR = r'%s wrapper.py ' + tar)
 foo.Tar(target = 'foo.tar', source = ['file10', 'file11'])
 foo.Tar(target = 'foo.tar', source = 'file12')
 bar.Tar(target = 'bar.tar', source = ['file13', 'file14'])
diff --git a/test/TARFLAGS.py b/test/TARFLAGS.py
index 9bf1359..583e274 100644
--- a/test/TARFLAGS.py
+++ b/test/TARFLAGS.py
@@ -87,7 +87,7 @@ test.fail_test(test.read('bbb.tar') != "options:  -x\nsub1/file5\nsub1/file6\nfi
 
 
 
-tar = test.where_is('tar')
+tar = test.detect('TAR', 'tar')
 
 if tar:
 
@@ -99,11 +99,10 @@ os.system(string.join(sys.argv[1:], " "))
 """ % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
 
     test.write('SConstruct', """
-foo = Environment(tools = ['tar'])
+foo = Environment()
 tar = foo['TAR']
-bar = Environment(tools = ['tar'],
-                  TAR = '',
-		  TARFLAGS = '%s wrapper.py ' + tar + ' -c -b 1')
+bar = Environment(TAR = '',
+		  TARFLAGS = r'%s wrapper.py ' + tar + ' -c -b 1')
 foo.Tar(target = 'foo.tar', source = ['file10', 'file11'])
 foo.Tar(target = 'foo.tar', source = 'file12')
 bar.Tar(target = 'bar.tar', source = ['file13', 'file14'])
diff --git a/test/option--D.py b/test/option--D.py
index dbfbb3e..67517cd 100644
--- a/test/option--D.py
+++ b/test/option--D.py
@@ -44,7 +44,7 @@ file.close()
 
 test.write('SConstruct', """
 import SCons.Defaults
-B = Builder(action='%s build.py $TARGET $SOURCES')
+B = Builder(action=r'%s build.py $TARGET $SOURCES')
 env = Environment()
 env['BUILDERS']['B'] = B
 env.B(target = 'sub1/foo.out', source = 'sub1/foo.in')
diff --git a/test/option-q.py b/test/option-q.py
index efb192a..c6f2131 100644
--- a/test/option-q.py
+++ b/test/option-q.py
@@ -43,7 +43,7 @@ file.close()
 """)
 
 test.write('SConstruct', """
-B = Builder(action='%s build.py $TARGET $SOURCES')
+B = Builder(action=r'%s build.py $TARGET $SOURCES')
 env = Environment(BUILDERS = { 'B' : B })
 env.B(target = 'aaa.out', source = 'aaa.in')
 env.B(target = 'bbb.out', source = 'bbb.in')
diff --git a/test/option-u.py b/test/option-u.py
index 54f4f46..5e00ea8 100644
--- a/test/option-u.py
+++ b/test/option-u.py
@@ -46,7 +46,7 @@ file.close()
 test.write('SConstruct', """
 import SCons.Defaults
 env = Environment()
-env['BUILDERS']['B'] = Builder(action='%s build.py $TARGET $SOURCES')
+env['BUILDERS']['B'] = Builder(action=r'%s build.py $TARGET $SOURCES')
 env.B(target = 'sub1/foo.out', source = 'sub1/foo.in')
 Default('.')
 Export('env')