From 9ac18d0456d1f7a43596221b83537083f532a823 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Wed, 26 Sep 2018 09:51:36 -0700
Subject: Speed up Glob tests for windows

---
 test/Glob/Repository.py | 3 ++-
 test/Glob/VariantDir.py | 5 +++--
 test/Glob/basic.py      | 3 ++-
 test/Glob/exclude.py    | 3 ++-
 test/Glob/source.py     | 3 ++-
 test/Glob/strings.py    | 3 ++-
 test/Glob/subdir.py     | 3 ++-
 test/Glob/subst.py      | 3 ++-
 8 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/test/Glob/Repository.py b/test/Glob/Repository.py
index 22a7f88..3308e62 100644
--- a/test/Glob/Repository.py
+++ b/test/Glob/Repository.py
@@ -47,6 +47,7 @@ work_src_yyy = test.workpath('work', 'src', 'yyy')
 opts = "-Y " + test.workpath('repository')
 
 test.write(['repository', 'SConstruct'], """\
+DefaultEnvironment(tools=[])
 def cat(env, source, target):
     target = str(target[0])
     f = open(target, "wb")
@@ -60,7 +61,7 @@ File('../repository/mmm.in')
 m = Glob('m*.in')
 assert str(m[0]) == 'mmm.in'
 
-env = Environment(BUILDERS={'Build':Builder(action=cat)})
+env = Environment(tools=[], BUILDERS={'Build':Builder(action=cat)})
 env.Build('aaa.out', Glob('a*.in'))
 env.Build('bbb.out', Glob('b*.in'))
 env.Build('ccc.out', Glob('c*.in'))
diff --git a/test/Glob/VariantDir.py b/test/Glob/VariantDir.py
index c9c1d07..3beb9ab 100644
--- a/test/Glob/VariantDir.py
+++ b/test/Glob/VariantDir.py
@@ -37,6 +37,7 @@ test.subdir('src')
 test.subdir('src/sub1')
 
 test.write('SConstruct', """\
+DefaultEnvironment(tools=[])
 VariantDir('var1', 'src')
 VariantDir('var2', 'src')
 
@@ -48,7 +49,7 @@ SConscript('src/sub1/SConscript', src_dir = 'src', variant_dir = 'var3', duplica
 """)
 
 test.write(['src', 'SConscript'], """\
-env = Environment() 
+env = Environment(tools=[]) 
 
 def concatenate(target, source, env):
     fp = open(str(target[0]), 'wb')
@@ -63,7 +64,7 @@ env.Concatenate('fex.out', sorted(Glob('f*.in', exclude = 'f1.in'), key=lambda t
 """)
 
 test.write(['src', 'sub1', 'SConscript'], """\
-env = Environment()
+env = Environment(tools=[])
 
 def concatenate(target, source, env):
     fp = open(str(target[0]), 'wb')
diff --git a/test/Glob/basic.py b/test/Glob/basic.py
index 9afbbc6..ad998c3 100644
--- a/test/Glob/basic.py
+++ b/test/Glob/basic.py
@@ -33,7 +33,8 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 test.write('SConstruct', """\
-env = Environment() 
+DefaultEnvironment(tools=[])
+env = Environment(tools=[]) 
 
 def concatenate(target, source, env):
     fp = open(str(target[0]), 'wb')
diff --git a/test/Glob/exclude.py b/test/Glob/exclude.py
index fe93b82..bc3e774 100644
--- a/test/Glob/exclude.py
+++ b/test/Glob/exclude.py
@@ -36,7 +36,8 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 test.write('SConstruct', """\
-env = Environment() 
+DefaultEnvironment(tools=[])
+env = Environment(tools=[]) 
 
 def concatenate(target, source, env):
     fp = open(str(target[0]), 'wb')
diff --git a/test/Glob/source.py b/test/Glob/source.py
index f1ea566..3d40d05 100644
--- a/test/Glob/source.py
+++ b/test/Glob/source.py
@@ -37,7 +37,8 @@ test = TestSCons.TestSCons()
 test.subdir('src', 'var1', 'var2')
 
 test.write('SConstruct', """\
-env = Environment() 
+DefaultEnvironment(tools=[])
+env = Environment(tools=[]) 
 
 def concatenate(target, source, env):
     fp = open(str(target[0]), 'wb')
diff --git a/test/Glob/strings.py b/test/Glob/strings.py
index 3e47d10..0780ace 100644
--- a/test/Glob/strings.py
+++ b/test/Glob/strings.py
@@ -37,6 +37,7 @@ test = TestSCons.TestSCons()
 test.subdir('src')
 
 test.write('SConstruct', """\
+DefaultEnvironment(tools=[])
 VariantDir('var1', 'src')
 VariantDir('var2', 'src')
 
@@ -45,7 +46,7 @@ SConscript('var2/SConscript')
 """)
 
 test.write(['src', 'SConscript'], """\
-env = Environment() 
+env = Environment(tools=[]) 
 
 def concatenate(target, source, env):
     fp = open(str(target[0]), 'wb')
diff --git a/test/Glob/subdir.py b/test/Glob/subdir.py
index 6fc00f6..1227788 100644
--- a/test/Glob/subdir.py
+++ b/test/Glob/subdir.py
@@ -36,7 +36,8 @@ test = TestSCons.TestSCons()
 test.subdir('subdir')
 
 test.write('SConstruct', """\
-env = Environment() 
+DefaultEnvironment(tools=[])
+env = Environment(tools=[]) 
 
 def concatenate(target, source, env):
     fp = open(str(target[0]), 'wb')
diff --git a/test/Glob/subst.py b/test/Glob/subst.py
index e21da81..6a145f1 100644
--- a/test/Glob/subst.py
+++ b/test/Glob/subst.py
@@ -34,7 +34,8 @@ import TestSCons
 test = TestSCons.TestSCons()
 
 test.write('SConstruct', """\
-env = Environment(PATTERN = 'f*.in')
+DefaultEnvironment(tools=[])
+env = Environment(tools=[], PATTERN = 'f*.in')
 
 def copy(target, source, env):
     fp = open(str(target[0]), 'wb')
-- 
cgit v0.12