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 /QMTest | |
| 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 'QMTest')
| -rw-r--r-- | QMTest/TestSCons.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index e14f8f4..2ef393c 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -757,7 +757,7 @@ print "self._msvs_versions =", str(env['MSVS']['VERSIONS']) def msvs_substitute(self, input, msvs_ver, subdir=None, sconscript=None, - python=sys.executable, + python=None, project_guid=None): if not hasattr(self, '_msvs_versions'): self.msvs_versions() @@ -770,6 +770,9 @@ print "self._msvs_versions =", str(env['MSVS']['VERSIONS']) if sconscript is None: sconscript = self.workpath('SConstruct') + if python is None: + python = sys.executable + if project_guid is None: project_guid = "{E5466E26-0003-F18B-8F8A-BCD76C86388D}" |