More changes to speed up testing on windows.

17 files changed, 29 insertions, 12 deletions

diff --git a/test/CacheDir/CacheDir.py b/test/CacheDir/CacheDir.py
index 45c5db5..3d2c3b5 100644
--- a/test/CacheDir/CacheDir.py
+++ b/test/CacheDir/CacheDir.py
@@ -45,6 +45,7 @@ src_all = test.workpath('src', 'all')
 test.subdir('cache', 'src')
 
 test.write(['src', 'SConstruct'], """\
+DefaultEnvironment(tools=[])
 CacheDir(r'%(cache)s')
 SConscript('SConscript')
 """ % locals())
@@ -57,7 +58,7 @@ def cat(env, source, target):
     for src in source:
         f.write(open(str(src), "r").read())
     f.close()
-env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env = Environment(tools=[], BUILDERS={'Cat':Builder(action=cat)})
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
diff --git a/test/CacheDir/NoCache.py b/test/CacheDir/NoCache.py
index b035b44..f0929aa 100644
--- a/test/CacheDir/NoCache.py
+++ b/test/CacheDir/NoCache.py
@@ -35,6 +35,7 @@ test = TestSCons.TestSCons()
 test.subdir('cache', 'alpha', 'beta')
 
 sconstruct = """
+DefaultEnvironment(tools=[])
 import os
 CacheDir(r'%s')
 
diff --git a/test/CacheDir/SideEffect.py b/test/CacheDir/SideEffect.py
index 2ddba31..4eae4c3 100644
--- a/test/CacheDir/SideEffect.py
+++ b/test/CacheDir/SideEffect.py
@@ -37,6 +37,7 @@ test.subdir('cache', 'work')
 cache = test.workpath('cache')
 
 test.write(['work', 'SConstruct'], """\
+DefaultEnvironment(tools=[])
 def copy(source, target):
     open(target, "w").write(open(source, "r").read())
 
@@ -51,7 +52,7 @@ def build(env, source, target):
 CacheDir(r'%(cache)s')
 
 Build = Builder(action=build)
-env = Environment(BUILDERS={'Build':Build}, SUBDIR='subdir')
+env = Environment(tools=[], BUILDERS={'Build':Build}, SUBDIR='subdir')
 env.Build('f1.out', 'f1.in')
 env.Build('f2.out', 'f2.in')
 env.Build('f3.out', 'f3.in')
diff --git a/test/CacheDir/VariantDir.py b/test/CacheDir/VariantDir.py
index d31b9ed..58918be 100644
--- a/test/CacheDir/VariantDir.py
+++ b/test/CacheDir/VariantDir.py
@@ -47,7 +47,7 @@ def cat(env, source, target):
     for src in source:
         f.write(open(str(src), "r").read())
     f.close()
-env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env = Environment(tools=[], BUILDERS={'Cat':Builder(action=cat)})
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
@@ -65,7 +65,8 @@ test.write(['src', 'ccc.in'], "ccc.in\n")
 
 #
 test.write('SConstruct', """\
-env = Environment(TWO = '2')
+DefaultEnvironment(tools=[])
+env = Environment(tools=[], TWO = '2')
 CacheDir(r'%s')
 VariantDir('build', 'src', duplicate=0)
 SConscript('build/SConscript')
diff --git a/test/CacheDir/debug.py b/test/CacheDir/debug.py
index e3186b0..7e08e0b 100644
--- a/test/CacheDir/debug.py
+++ b/test/CacheDir/debug.py
@@ -45,6 +45,7 @@ debug_out = test.workpath('cache-debug.out')
 
 
 test.write(['src', 'SConstruct'], """\
+DefaultEnvironment(tools=[])
 CacheDir(r'%(cache)s')
 SConscript('SConscript')
 """ % locals())
@@ -57,7 +58,7 @@ def cat(env, source, target):
     for src in source:
         f.write(open(str(src), "r").read())
     f.close()
-env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env = Environment(tools=[], BUILDERS={'Cat':Builder(action=cat)})
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
diff --git a/test/CacheDir/environment.py b/test/CacheDir/environment.py
index e37b999..5d8eb6c 100644
--- a/test/CacheDir/environment.py
+++ b/test/CacheDir/environment.py
@@ -46,6 +46,7 @@ src_all = test.workpath('src', 'all')
 test.subdir('cache', 'src')
 
 test.write(['src', 'SConstruct'], """\
+DefaultEnvironment(tools=[])
 CacheDir(r'%(cache)s')
 SConscript('SConscript')
 """ % locals())
@@ -58,7 +59,7 @@ def cat(env, source, target):
     for src in source:
         f.write(open(str(src), "r").read())
     f.close()
-env_cache = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env_cache = Environment(tools=[], BUILDERS={'Cat':Builder(action=cat)})
 env_nocache = env_cache.Clone()
 env_nocache.CacheDir(None)
 env_cache.Cat('aaa.out', 'aaa.in')
diff --git a/test/CacheDir/multi-targets.py b/test/CacheDir/multi-targets.py
index 9ca194e..7977ba0 100644
--- a/test/CacheDir/multi-targets.py
+++ b/test/CacheDir/multi-targets.py
@@ -40,11 +40,12 @@ multiple_bar = test.workpath('multiple', 'bar')
 multiple_foo = test.workpath('multiple', 'foo')
 
 test.write(['multiple', 'SConstruct'], """\
+DefaultEnvironment(tools=[])
 def touch(env, source, target):
     open('foo', 'w').write("")
     open('bar', 'w').write("")
 CacheDir(r'%(cache)s')
-env = Environment()
+env = Environment(tools=[])
 env.Command(['foo', 'bar'], ['input'], touch)
 """ % locals())
 
diff --git a/test/CacheDir/multiple-targets.py b/test/CacheDir/multiple-targets.py
index d7e6ac7..9f94e4c 100644
--- a/test/CacheDir/multiple-targets.py
+++ b/test/CacheDir/multiple-targets.py
@@ -38,11 +38,12 @@ test = TestSCons.TestSCons()
 test.subdir('cache')
 
 test.write('SConstruct', """\
+DefaultEnvironment(tools=[])
 def touch(env, source, target):
     open('foo', 'w').write("")
     open('bar', 'w').write("")
 CacheDir(r'%s')
-env = Environment()
+env = Environment(tools=[], )
 env.Command(['foo', 'bar'], ['input'], touch)
 """ % (test.workpath('cache')))
 
diff --git a/test/CacheDir/option--cd.py b/test/CacheDir/option--cd.py
index fad5add..20d1184 100644
--- a/test/CacheDir/option--cd.py
+++ b/test/CacheDir/option--cd.py
@@ -39,6 +39,7 @@ test = TestSCons.TestSCons()
 test.subdir('cache', 'src')
 
 test.write(['src', 'SConstruct'], """
+DefaultEnvironment(tools=[])
 def cat(env, source, target):
     target = str(target[0])
     open('cat.out', 'a').write(target + "\\n")
@@ -46,7 +47,7 @@ def cat(env, source, target):
     for src in source:
         f.write(open(str(src), "r").read())
     f.close()
-env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env = Environment(tools=[], BUILDERS={'Cat':Builder(action=cat)})
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
diff --git a/test/CacheDir/option--cf.py b/test/CacheDir/option--cf.py
index bb9d1cc..5e823ae 100644
--- a/test/CacheDir/option--cf.py
+++ b/test/CacheDir/option--cf.py
@@ -46,7 +46,7 @@ def cat(env, source, target):
     for src in source:
         f.write(open(str(src), "r").read())
     f.close()
-env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env = Environment(tools=[], BUILDERS={'Cat':Builder(action=cat)})
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
diff --git a/test/CacheDir/option--cr.py b/test/CacheDir/option--cr.py
index 792dede..4ed587c 100644
--- a/test/CacheDir/option--cr.py
+++ b/test/CacheDir/option--cr.py
@@ -39,6 +39,7 @@ test = TestSCons.TestSCons()
 test.subdir('cache', 'src')
 
 test.write(['src', 'SConstruct'], """
+DefaultEnvironment(tools=[])
 def cat(env, source, target):
     target = str(target[0])
     open('cat.out', 'a').write(target + "\\n")
@@ -46,7 +47,7 @@ def cat(env, source, target):
     for src in source:
         f.write(open(str(src), "r").read())
     f.close()
-env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env = Environment(tools=[], BUILDERS={'Cat':Builder(action=cat)})
 env.Cat('aaa.out', 'aaa.in')
 env.Cat('bbb.out', 'bbb.in')
 env.Cat('ccc.out', 'ccc.in')
diff --git a/test/CacheDir/option--cs.py b/test/CacheDir/option--cs.py
index 2e37e5a..b73fb70 100644
--- a/test/CacheDir/option--cs.py
+++ b/test/CacheDir/option--cs.py
@@ -55,6 +55,7 @@ file.close()
 cache = test.workpath('cache')
 
 test.write(['src1', 'SConstruct'], """
+DefaultEnvironment(tools=[])
 def cat(env, source, target):
     target = str(target[0])
     open('cat.out', 'a').write(target + "\\n")
@@ -62,7 +63,8 @@ def cat(env, source, target):
     for src in source:
         f.write(open(str(src), "r").read())
     f.close()
-env = Environment(BUILDERS={'Internal':Builder(action=cat),
+env = Environment(tools=[], 
+                  BUILDERS={'Internal':Builder(action=cat),
                             'External':Builder(action=r'%(_python_)s build.py $TARGET $SOURCES')})
 env.External('aaa.out', 'aaa.in')
 env.External('bbb.out', 'bbb.in')
diff --git a/test/CacheDir/readonly-cache.py b/test/CacheDir/readonly-cache.py
index db3b3ec..6520106 100755
--- a/test/CacheDir/readonly-cache.py
+++ b/test/CacheDir/readonly-cache.py
@@ -37,6 +37,7 @@ from stat import *
 test = TestSCons.TestSCons()
 
 test.write(['SConstruct'], """\
+DefaultEnvironment(tools=[])
 CacheDir('cache')
 Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE'))
 """)
diff --git a/test/CacheDir/scanner-target.py b/test/CacheDir/scanner-target.py
index c39042e..7df9792 100644
--- a/test/CacheDir/scanner-target.py
+++ b/test/CacheDir/scanner-target.py
@@ -41,6 +41,7 @@ test = TestSCons.TestSCons()
 test.subdir('cache')
 
 test.write('SConstruct', """\
+DefaultEnvironment(tools=[])
 import SCons
 
 CacheDir(r'%s')
diff --git a/test/CacheDir/source-scanner.py b/test/CacheDir/source-scanner.py
index 2359872..f00360d 100644
--- a/test/CacheDir/source-scanner.py
+++ b/test/CacheDir/source-scanner.py
@@ -43,6 +43,7 @@ cache = test.workpath('cache')
 test.subdir('cache', 'subdir')
 
 test.write(['subdir', 'SConstruct'], """\
+DefaultEnvironment(tools=[])
 import SCons
 
 CacheDir(r'%(cache)s')
diff --git a/test/CacheDir/timestamp-match.py b/test/CacheDir/timestamp-match.py
index afc3f63..4b64137 100644
--- a/test/CacheDir/timestamp-match.py
+++ b/test/CacheDir/timestamp-match.py
@@ -33,6 +33,7 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 test.write(['SConstruct'], """\
+DefaultEnvironment(tools=[])
 Decider('timestamp-match')
 CacheDir('cache')
 Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE'))
diff --git a/test/CacheDir/timestamp-newer.py b/test/CacheDir/timestamp-newer.py
index 8a47fec..618f467 100644
--- a/test/CacheDir/timestamp-newer.py
+++ b/test/CacheDir/timestamp-newer.py
@@ -33,6 +33,7 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 test.write(['SConstruct'], """\
+DefaultEnvironment(tools=[])
 Decider('timestamp-newer')
 CacheDir('cache')
 Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE'))