From f0418503e2f6d85313c9b531a9eefe6293023539 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Fri, 19 Sep 2008 16:02:13 +0000 Subject: [PATCH] Make the test/MSVC/{msvc,hierarchical}.py tests work even if %INCLUDE% and %LIB% aren't set. git-svn-id: http://scons.tigris.org/svn/scons/trunk@3438 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- test/MSVC/hierarchical.py | 4 ++-- 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 2dece667..19b9dcc2 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 552d039a..3d2f1f47 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] -- 2.26.2