Fix for Windows that doesn't break other systems: delete the

PYTHON_ROOT environment variable instead of nulling it out.
(Bill Deegan)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3454 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py
index f00de517a61fd15f845c672c0d6d302523f540e3..9f51c8ce3305c6132a902d57c9706b43a3e30739 100644 (file)
--- a/test/MSVS/vs-7.0-files.py
+++ b/test/MSVS/vs-7.0-files.py
@@ -214,7 +214,7 @@ expect = test.msvs_substitute(expected_vcprojfile, '7.0', 'work1', 'SConstruct',
 # don't compare the pickled data
 assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
-os.environ['PYTHON_ROOT'] = ''
+del os.environ['PYTHON_ROOT']
 python = None
 
 

diff --git a/test/MSVS/vs-7.1-files.py b/test/MSVS/vs-7.1-files.py
index 8c9821c81f42d4bdfdfa59d6189dbe247fb8f5a9..e1f90106670eaa138a3fc777c4bf73952414e4ad 100644 (file)
--- a/test/MSVS/vs-7.1-files.py
+++ b/test/MSVS/vs-7.1-files.py
@@ -216,7 +216,7 @@ expect = test.msvs_substitute(expected_vcprojfile, '7.1', 'work1', 'SConstruct',
 # don't compare the pickled data
 assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
-os.environ['PYTHON_ROOT'] = ''
+del os.environ['PYTHON_ROOT']
 python = None
 
 

diff --git a/test/MSVS/vs-8.0-files.py b/test/MSVS/vs-8.0-files.py
index 40daa57fa6b04bf545bbeb5fb16b44561752c311..0664d234ce35d1cecc439196b9761a905b2b88cb 100644 (file)
--- a/test/MSVS/vs-8.0-files.py
+++ b/test/MSVS/vs-8.0-files.py
@@ -223,7 +223,7 @@ expect = test.msvs_substitute(expected_vcprojfile, '8.0', 'work1', 'SConstruct',
 # don't compare the pickled data
 assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj)
 
-os.environ['PYTHON_ROOT'] = ''
+del os.environ['PYTHON_ROOT']
 python = None