diff options
author | Steven Knight <knight@baldmt.com> | 2008-09-19 16:02:13 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2008-09-19 16:02:13 (GMT) |
commit | 0981328e8845515903fe0f14a098d3a786e9dd70 (patch) | |
tree | cf93d636914d29f630b7af8d021ad28a46bc2ace /test | |
parent | 3c7ed247f90c0c10f42ce491e52326357cb45580 (diff) | |
download | SCons-0981328e8845515903fe0f14a098d3a786e9dd70.zip SCons-0981328e8845515903fe0f14a098d3a786e9dd70.tar.gz SCons-0981328e8845515903fe0f14a098d3a786e9dd70.tar.bz2 |
Make the test/MSVC/{msvc,hierarchical}.py tests work even if
%INCLUDE% and %LIB% aren't set.
Diffstat (limited to 'test')
-rw-r--r-- | test/MSVC/hierarchical.py | 4 | ||||
-rw-r--r-- | test/MSVC/msvc.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/MSVC/hierarchical.py b/test/MSVC/hierarchical.py index 2dece66..19b9dcc 100644 --- a/test/MSVC/hierarchical.py +++ b/test/MSVC/hierarchical.py @@ -50,8 +50,8 @@ SConscript('build/SConscript') test.write('src/SConscript',"""
import os
env = Environment()
-env.Append(CPPPATH=os.environ['INCLUDE'],
- LIBPATH=os.environ['LIB'])
+env.Append(CPPPATH=os.environ.get('INCLUDE', ''),
+ LIBPATH=os.environ.get('LIB', ''))
env['PCH'] = 'StdAfx.pch'
env['PDB'] = '#out/test.pdb'
env['PCHSTOP'] = 'StdAfx.h'
diff --git a/test/MSVC/msvc.py b/test/MSVC/msvc.py index 552d039..3d2f1f4 100644 --- a/test/MSVC/msvc.py +++ b/test/MSVC/msvc.py @@ -43,8 +43,8 @@ if sys.platform != 'win32': test.write('SConstruct',""" import os env = Environment() -env.Append(CPPPATH=os.environ['INCLUDE'], - LIBPATH=os.environ['LIB']) +env.Append(CPPPATH=os.environ.get('INCLUDE', ''), + LIBPATH=os.environ.get('LIB', '')) env['PDB'] = File('test.pdb') env['PCHSTOP'] = 'StdAfx.h' env['PCH'] = env.PCH('StdAfx.cpp')[0] |