Test fixes for Python 2.3.3 on Win32. (Anthony Roach)

3 files changed, 10 insertions, 10 deletions

diff --git a/test/Configure.py b/test/Configure.py
index d3a8db7..7da4e9e 100644
--- a/test/Configure.py
+++ b/test/Configure.py
@@ -84,7 +84,7 @@ try:
     test.write([work_dir,  'SConstruct'], """
 env = Environment()
 import os
-env['ENV']['PATH'] = os.environ['PATH']
+env.AppendENVPath('PATH', os.environ['PATH'])
 conf = Configure(env)
 r1 = conf.CheckLibWithHeader( '%s', 'math.h', 'c' )
 r2 = conf.CheckLibWithHeader( None, 'math.h', 'c' )
@@ -121,7 +121,7 @@ Checking for C++ header file vector... yes
     test.write([work_dir,  'SConstruct'], """
 env = Environment()
 import os
-env['ENV']['PATH'] = os.environ['PATH']
+env.AppendENVPath('PATH', os.environ['PATH'])
 conf = env.Configure()
 r1 = conf.CheckCHeader( 'no_std_c_header.h' ) # leads to compile error
 r2 = conf.CheckLib( 'no_c_library_SAFFDG' )   # leads to link error
@@ -152,7 +152,7 @@ Checking for main() in C library no_c_library_SAFFDG... no
     test.write([work_dir,  'SConstruct'], """
 env = Environment()
 import os
-env['ENV']['PATH'] = os.environ['PATH']
+env.AppendENVPath('PATH', os.environ['PATH'])
 conf = Configure(env)
 r1 = conf.CheckCHeader( 'math.h' )
 r2 = conf.CheckCHeader( 'no_std_c_header.h' ) # leads to compile error
@@ -190,7 +190,7 @@ Checking for C header file no_std_c_header.h... no
     test.write([work_dir,  'SConstruct'], """
 env = Environment(LOGFILE='build/config.log')
 import os
-env['ENV']['PATH'] = os.environ['PATH']
+env.AppendENVPath('PATH', os.environ['PATH'])
 BuildDir( 'build', '.' )
 conf = env.Configure(conf_dir='build/config.tests', log_file='$LOGFILE')
 r1 = conf.CheckCHeader( 'math.h' )
@@ -253,7 +253,7 @@ def CustomTest(context):
 env = Environment(FOO='fff')
 env.Append( CPPPATH='local' )
 import os
-env['ENV']['PATH'] = os.environ['PATH']
+env.AppendENVPath('PATH', os.environ['PATH'])
 conf = Configure( env, custom_tests = {'CustomTest' : CustomTest,
                                        '$FOO' : CustomTest} )
 if hasattr(conf, 'fff'):
@@ -335,7 +335,7 @@ def CheckCustom(test):
 
 env = Environment()
 import os
-env['ENV']['PATH'] = os.environ['PATH']
+env.AppendENVPath('PATH', os.environ['PATH'])
 conf = Configure( env, custom_tests={'CheckCustom' : CheckCustom} )
 conf.CheckCustom()
 env = conf.Finish()
diff --git a/test/SetBuildSignatureType.py b/test/SetBuildSignatureType.py
index 54f967f..3449304 100644
--- a/test/SetBuildSignatureType.py
+++ b/test/SetBuildSignatureType.py
@@ -73,7 +73,7 @@ def copy1(env, source, target):
     open(str(target[0]), 'wb').write(open(str(source[0]), 'rb').read())
 
 def copy2(env, source, target):
-    # added this line
+    x = 2 # added this line
     return copy1(env, source, target)
 
 env['BUILDERS']['Copy1'] = Builder(action=copy1)
@@ -99,7 +99,7 @@ def copy1(env, source, target):
     open(str(target[0]), 'wb').write(open(str(source[0]), 'rb').read())
 
 def copy2(env, source, target):
-    # added this line
+    x = 2 # added this line
     return copy1(env, source, target)
 
 env['BUILDERS']['Copy1'] = Builder(action=copy1)
diff --git a/test/TargetSignatures.py b/test/TargetSignatures.py
index 5060157..2ee016e 100644
--- a/test/TargetSignatures.py
+++ b/test/TargetSignatures.py
@@ -71,7 +71,7 @@ def copy1(env, source, target):
     open(str(target[0]), 'wb').write(open(str(source[0]), 'rb').read())
 
 def copy2(env, source, target):
-    # added this line
+    x = 2 # added this line
     return copy1(env, source, target)
 
 env['BUILDERS']['Copy1'] = Builder(action=copy1)
@@ -103,7 +103,7 @@ def copy1(env, source, target):
     open(str(target[0]), 'wb').write(open(str(source[0]), 'rb').read())
 
 def copy2(env, source, target):
-    # added this line
+    x = 2 # added this line
     return copy1(env, source, target)
 
 env['BUILDERS']['Copy1'] = Builder(action=copy1)