Remove the setting of the ENV property to os.environ.

13 files changed, 8 insertions, 14 deletions

diff --git a/test/D/CoreScanner/Image/SConstruct_template b/test/D/CoreScanner/Image/SConstruct_template
index a128c67..e91343b 100644
--- a/test/D/CoreScanner/Image/SConstruct_template
+++ b/test/D/CoreScanner/Image/SConstruct_template
@@ -3,7 +3,6 @@
 import os
 
 environment = Environment(
-    ENV=os.environ,
     tools=['link', '{}'])
 environment.Program('test1.d')
 environment.Program('test2.d')
diff --git a/test/D/DMD.py b/test/D/DMD.py
index 1bde380..4b1c125 100644
--- a/test/D/DMD.py
+++ b/test/D/DMD.py
@@ -37,7 +37,7 @@ if not dmd:
 
 test.write('SConstruct', """\
 import os
-env = Environment(ENV=os.environ)
+env = Environment()
 if env['PLATFORM'] == 'cygwin': env['OBJSUFFIX'] = '.obj'  # trick DMD
 env.Program('foo', 'foo.d')
 """)
diff --git a/test/D/DMD2.py b/test/D/DMD2.py
index cc8ab93..3634d88 100644
--- a/test/D/DMD2.py
+++ b/test/D/DMD2.py
@@ -36,7 +36,7 @@ if not test.where_is('dmd') and not test.where_is('gdmd'):
 
 test.write('SConstruct', """\
 import os
-env = Environment(tools=['link', 'dmd'], ENV=os.environ)
+env = Environment(tools=['link', 'dmd'])
 if env['PLATFORM'] == 'cygwin': env['OBJSUFFIX'] = '.obj'  # trick DMD
 env.Program('foo', 'foo.d')
 """)
diff --git a/test/D/DMD2_Alt.py b/test/D/DMD2_Alt.py
index fbe2f2b..27b21d0 100644
--- a/test/D/DMD2_Alt.py
+++ b/test/D/DMD2_Alt.py
@@ -36,7 +36,7 @@ if not test.where_is('dmd') and not test.where_is('gdmd'):
 
 test.write('SConstruct', """\
 import os
-env = Environment(tools=['dmd', 'link'], ENV=os.environ)
+env = Environment(tools=['dmd', 'link'])
 if env['PLATFORM'] == 'cygwin': env['OBJSUFFIX'] = '.obj'  # trick DMD
 env.Program('foo', 'foo.d')
 """)
diff --git a/test/D/GDC.py b/test/D/GDC.py
index e24ec43..b548b94 100644
--- a/test/D/GDC.py
+++ b/test/D/GDC.py
@@ -36,7 +36,7 @@ if not test.where_is('gdc'):
 
 test.write('SConstruct', """\
 import os
-env = Environment(tools=['link', 'gdc'], ENV=os.environ)
+env = Environment(tools=['link', 'gdc'])
 if env['PLATFORM'] == 'cygwin': env['OBJSUFFIX'] = '.obj'  # trick DMD
 env.Program('foo', 'foo.d')
 """)
diff --git a/test/D/GDC_Alt.py b/test/D/GDC_Alt.py
index cac7949..27159ee 100644
--- a/test/D/GDC_Alt.py
+++ b/test/D/GDC_Alt.py
@@ -36,7 +36,7 @@ if not test.where_is('gdc'):
 
 test.write('SConstruct', """\
 import os
-env = Environment(tools=['gdc', 'link'], ENV=os.environ)
+env = Environment(tools=['gdc', 'link'])
 if env['PLATFORM'] == 'cygwin': env['OBJSUFFIX'] = '.obj'  # trick DMD
 env.Program('foo', 'foo.d')
 """)
diff --git a/test/D/HSTeoh/LinkingProblem/SConstruct_template b/test/D/HSTeoh/LinkingProblem/SConstruct_template
index 6815cdf..a4aa795 100644
--- a/test/D/HSTeoh/LinkingProblem/SConstruct_template
+++ b/test/D/HSTeoh/LinkingProblem/SConstruct_template
@@ -3,8 +3,7 @@
 import os
 
 environment = Environment(
-    ENV=os.environ,
-    tools = ['cc', 'link' , '{}'],
+    tools = ['cc', '{}', 'link'],
     LIBS = ['ncurses'])
 
 environment.Object('ncurs_impl.o', 'ncurs_impl.c')
diff --git a/test/D/HSTeoh/SingleStringCannotBeMultipleOptions/SConstruct_template b/test/D/HSTeoh/SingleStringCannotBeMultipleOptions/SConstruct_template
index 89c603b..118a7b2 100644
--- a/test/D/HSTeoh/SingleStringCannotBeMultipleOptions/SConstruct_template
+++ b/test/D/HSTeoh/SingleStringCannotBeMultipleOptions/SConstruct_template
@@ -3,7 +3,6 @@
 import os
 
 environment = Environment(
-    ENV=os.environ,
     tools=['link', '{}'],
     # It might be thought that a single string can contain multiple options space separated. Actually this
     # is deemed to be a single option, so leads to an error.
diff --git a/test/D/HelloWorld/CompileAndLinkOneStep/Image/SConstruct_template b/test/D/HelloWorld/CompileAndLinkOneStep/Image/SConstruct_template
index c688ab7..e2e7439 100644
--- a/test/D/HelloWorld/CompileAndLinkOneStep/Image/SConstruct_template
+++ b/test/D/HelloWorld/CompileAndLinkOneStep/Image/SConstruct_template
@@ -3,7 +3,6 @@
 import os
 
 environment = Environment(
-    ENV=os.environ,
     tools=['link', '{}'])
 
 environment.Program('helloWorld.d')
diff --git a/test/D/HelloWorld/CompileThenLinkTwoSteps/Image/SConstruct_template b/test/D/HelloWorld/CompileThenLinkTwoSteps/Image/SConstruct_template
index 425970a..b38a9f0 100644
--- a/test/D/HelloWorld/CompileThenLinkTwoSteps/Image/SConstruct_template
+++ b/test/D/HelloWorld/CompileThenLinkTwoSteps/Image/SConstruct_template
@@ -3,7 +3,6 @@
 import os
 
 environment = Environment(
-    ENV=os.environ,
     tools=['link', '{}'])
 
 objects = environment.Object('helloWorld.d')
diff --git a/test/D/LDC.py b/test/D/LDC.py
index 94acf1c..19070a5 100644
--- a/test/D/LDC.py
+++ b/test/D/LDC.py
@@ -43,7 +43,7 @@ if not isExecutableOfToolAvailable(test, 'ldc'):
 
 test.write('SConstruct', """\
 import os
-env = Environment(tools=['link', 'ldc'], ENV=os.environ)
+env = Environment(tools=['link', 'ldc'])
 if env['PLATFORM'] == 'cygwin': env['OBJSUFFIX'] = '.obj'  # trick DMD
 env.Program('foo', 'foo.d')
 """)
diff --git a/test/D/LDC_Alt.py b/test/D/LDC_Alt.py
index 571b8f0..bca7dd6 100644
--- a/test/D/LDC_Alt.py
+++ b/test/D/LDC_Alt.py
@@ -43,7 +43,7 @@ if not isExecutableOfToolAvailable(test, 'ldc'):
 
 test.write('SConstruct', """\
 import os
-env = Environment(tools=['ldc', 'link'], ENV=os.environ)
+env = Environment(tools=['ldc', 'link'])
 if env['PLATFORM'] == 'cygwin': env['OBJSUFFIX'] = '.obj'  # trick DMD
 env.Program('foo', 'foo.d')
 """)
diff --git a/test/D/MixedDAndC/Image/SConstruct b/test/D/MixedDAndC/Image/SConstruct
index 47870d7..5cf58a3 100644
--- a/test/D/MixedDAndC/Image/SConstruct
+++ b/test/D/MixedDAndC/Image/SConstruct
@@ -3,7 +3,6 @@
 import os
 
 environment = Environment(
-    ENV=os.environ,
     DFLAGS=['-m64', '-O'])
 
 environment.Program('proj', [