Speed up Climb tests on windows

7 files changed, 12 insertions, 5 deletions

diff --git a/test/Climb/explicit-parent--D.py b/test/Climb/explicit-parent--D.py
index f894e33..6f669c3 100644
--- a/test/Climb/explicit-parent--D.py
+++ b/test/Climb/explicit-parent--D.py
@@ -36,13 +36,14 @@ test = TestSCons.TestSCons()
 test.subdir(['subdir'])
 
 test.write('SConstruct', """\
+DefaultEnvironment(tools=[])
 def cat(env, source, target):
     target = str(target[0])
     f = open(target, "wb")
     for src in source:
         f.write(open(str(src), "rb").read())
     f.close()
-env = Environment(BUILDERS={'Cat':Builder(action=cat)})
+env = Environment(tools=[], BUILDERS={'Cat':Builder(action=cat)})
 env.Cat('f1.out', 'f1.in')
 f2 = env.Cat('f2.out', 'f2.in')
 Default(f2)
diff --git a/test/Climb/filename--D.py b/test/Climb/filename--D.py
index 6fea9bc..fee72f6 100644
--- a/test/Climb/filename--D.py
+++ b/test/Climb/filename--D.py
@@ -36,6 +36,7 @@ test = TestSCons.TestSCons()
 test.subdir('subdir', 'other')
 
 test.write('main.scons', """\
+DefaultEnvironment(tools=[])
 print("main.scons")
 SConscript('subdir/sub.scons')
 """)
diff --git a/test/Climb/filename--U.py b/test/Climb/filename--U.py
index 49ccc0a..91a83f4 100644
--- a/test/Climb/filename--U.py
+++ b/test/Climb/filename--U.py
@@ -36,6 +36,7 @@ test = TestSCons.TestSCons()
 test.subdir('subdir', 'other')
 
 test.write('main.scons', """\
+DefaultEnvironment(tools=[])
 print("main.scons")
 SConscript('subdir/sub.scons')
 """)
diff --git a/test/Climb/filename-u.py b/test/Climb/filename-u.py
index 4485c4b..006e53e 100644
--- a/test/Climb/filename-u.py
+++ b/test/Climb/filename-u.py
@@ -36,6 +36,7 @@ test = TestSCons.TestSCons()
 test.subdir('subdir', 'other')
 
 test.write('main.scons', """\
+DefaultEnvironment(tools=[])
 print("main.scons")
 SConscript('subdir/sub.scons')
 """)
diff --git a/test/Climb/option--D.py b/test/Climb/option--D.py
index 57c0853..42b92d8 100644
--- a/test/Climb/option--D.py
+++ b/test/Climb/option--D.py
@@ -41,9 +41,10 @@ file.close()
 """)
 
 test.write('SConstruct', """
+DefaultEnvironment(tools=[])
 import SCons.Defaults
 B = Builder(action=r'%(_python_)s build.py $TARGET $SOURCES')
-env = Environment()
+env = Environment(tools=[])
 env['BUILDERS']['B'] = B
 env.B(target = 'sub1/foo.out', source = 'sub1/foo.in')
 Export('env')
diff --git a/test/Climb/option--U.py b/test/Climb/option--U.py
index 04ab26a..c0e6e1e 100644
--- a/test/Climb/option--U.py
+++ b/test/Climb/option--U.py
@@ -43,8 +43,9 @@ file.close()
 """)
 
 test.write('SConstruct', r"""
+DefaultEnvironment(tools=[])
 import SCons.Defaults
-env = Environment()
+env = Environment(tools=[])
 env['BUILDERS']['B'] = Builder(action=r'%(_python_)s build.py $TARGET $SOURCES', multi=1)
 Default(env.B(target = 'sub1/foo.out', source = 'sub1/foo.in'))
 Export('env')
@@ -83,7 +84,7 @@ test.must_not_exist(test.workpath('sub2/xxx.out'))
 test.unlink(['sub1', 'foo.out'])
 
 test.write('SConscript', """\
-env = Environment()
+env = Environment(tools=[], )
 assert env.GetLaunchDir() == r'%s'
 """%test.workpath('sub1'))
 test.run(arguments = '-U',
diff --git a/test/Climb/option-u.py b/test/Climb/option-u.py
index eeb2ccc..21e83cf 100644
--- a/test/Climb/option-u.py
+++ b/test/Climb/option-u.py
@@ -41,13 +41,14 @@ test.subdir('sub1',
             'sub4', ['sub4', 'dir'])
 
 test.write('SConstruct', """
+DefaultEnvironment(tools=[])
 def cat(env, source, target):
     target = str(target[0])
     f = open(target, "wb")
     for src in source:
         f.write(open(str(src), "rb").read())
     f.close()
-env = Environment()
+env = Environment(tools=[])
 env.Append(BUILDERS = {'Cat' : Builder(action=cat)})
 env.Cat(target = 'sub1/f1a.out', source = 'sub1/f1a.in')
 env.Cat(target = 'sub1/f1b.out', source = 'sub1/f1b.in')