From c097b868bbf4777bfac714d0a92a0c78769bc36a Mon Sep 17 00:00:00 2001 From: stevenknight Date: Mon, 22 Sep 2008 20:29:53 +0000 Subject: [PATCH] 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 --- test/MSVS/vs-7.0-files.py | 2 +- test/MSVS/vs-7.1-files.py | 2 +- test/MSVS/vs-8.0-files.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py index f00de517..9f51c8ce 100644 --- 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 8c9821c8..e1f90106 100644 --- 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 40daa57f..0664d234 100644 --- 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 -- 2.26.2