diff options
| author | Steven Knight <knight@baldmt.com> | 2008-09-20 13:41:57 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-09-20 13:41:57 (GMT) |
| commit | 61bcb77878e7137ceb2881f5b22c8127f5738629 (patch) | |
| tree | 67f64b048f91e062e805d7d5444c752ef608a9e5 /test/MSVS/vs-7.0-files.py | |
| parent | df866c47321b2ade752d320045fbd6eb0062b5ee (diff) | |
| download | SCons-61bcb77878e7137ceb2881f5b22c8127f5738629.zip SCons-61bcb77878e7137ceb2881f5b22c8127f5738629.tar.gz SCons-61bcb77878e7137ceb2881f5b22c8127f5738629.tar.bz2 | |
Windows test fix: enhance the TestSCons class so an explicit
python=None argument still defaults to sys.executable. Use this to
reset the python value we interpolate into the expected files that we
generate after resetting the os.environ['PYTHON'] value.
Diffstat (limited to 'test/MSVS/vs-7.0-files.py')
| -rw-r--r-- | test/MSVS/vs-7.0-files.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/MSVS/vs-7.0-files.py b/test/MSVS/vs-7.0-files.py index 2535514..f00de51 100644 --- a/test/MSVS/vs-7.0-files.py +++ b/test/MSVS/vs-7.0-files.py @@ -203,11 +203,10 @@ test.must_not_exist(test.workpath('work1', 'Test.sln')) # Test that running SCons with $PYTHON_ROOT in the environment # changes the .vcproj output as expected. os.environ['PYTHON_ROOT'] = 'xyzzy' +python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSCons.python)[1]) test.run(chdir='work1', arguments='Test.vcproj') -python = os.path.join('$(PYTHON_ROOT)', os.path.split(TestSCons.python)[1]) - test.must_exist(test.workpath('work1', 'Test.vcproj')) vcproj = test.read(['work1', 'Test.vcproj'], 'r') expect = test.msvs_substitute(expected_vcprojfile, '7.0', 'work1', 'SConstruct', @@ -216,6 +215,7 @@ expect = test.msvs_substitute(expected_vcprojfile, '7.0', 'work1', 'SConstruct', assert vcproj[:len(expect)] == expect, test.diff_substr(expect, vcproj) os.environ['PYTHON_ROOT'] = '' +python = None |