diff options
| author | Steven Knight <knight@baldmt.com> | 2004-04-28 11:57:44 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-04-28 11:57:44 (GMT) |
| commit | 31e22cb37b82c626158506282733b8a646bd863e (patch) | |
| tree | 30857787f3fc35878a7710242020daa735637168 /test/Configure.py | |
| parent | 00403c6ffe98e56807ece34499265e3602bcc38a (diff) | |
| download | SCons-31e22cb37b82c626158506282733b8a646bd863e.zip SCons-31e22cb37b82c626158506282733b8a646bd863e.tar.gz SCons-31e22cb37b82c626158506282733b8a646bd863e.tar.bz2 | |
Test fixes for Python 2.3.3 on Win32. (Anthony Roach)
Diffstat (limited to 'test/Configure.py')
| -rw-r--r-- | test/Configure.py | 12 |
1 files changed, 6 insertions, 6 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() |