diff options
| author | Steven Knight <knight@baldmt.com> | 2008-09-27 14:28:11 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-09-27 14:28:11 (GMT) |
| commit | 951c698a7252b2382f126cd2e9eb9c95195f6633 (patch) | |
| tree | d2ea259b73fd74ebc3fd5830227a8778301e6f67 /QMTest | |
| parent | 55b3ad3b84bb73bc4e2d7c88bb7b3d2369552724 (diff) | |
| download | SCons-951c698a7252b2382f126cd2e9eb9c95195f6633.zip SCons-951c698a7252b2382f126cd2e9eb9c95195f6633.tar.gz SCons-951c698a7252b2382f126cd2e9eb9c95195f6633.tar.bz2 | |
Fix scons-local packaging test breakage in MSVS tests by correcting
the spelling of TestSCons._scons_version to TestSCons.scons_version.
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestSConsMSVS.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/QMTest/TestSConsMSVS.py b/QMTest/TestSConsMSVS.py index bb5fac4..7d9e9a0 100644 --- a/QMTest/TestSConsMSVS.py +++ b/QMTest/TestSConsMSVS.py @@ -575,7 +575,7 @@ class TestSConsMSVS(TestSCons): # doesn't fill it in when packaging SCons. input = """\ import SCons -print "self._scons_version =", repr(SCons.__%s__) +print "self.scons_version =", repr(SCons.__%s__) env = Environment(); print "self._msvs_versions =", str(env['MSVS']['VERSIONS']) """ % 'version' @@ -621,7 +621,7 @@ print "self._msvs_versions =", str(env['MSVS']['VERSIONS']) if os.environ.has_key('SCONS_LIB_DIR'): exec_script_main = "from os.path import join; import sys; sys.path = [ r'%s' ] + sys.path; import SCons.Script; SCons.Script.main()" % os.environ['SCONS_LIB_DIR'] else: - exec_script_main = "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-%s'), join(sys.prefix, 'scons-%s'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons') ] + sys.path; import SCons.Script; SCons.Script.main()" % (self._scons_version, self._scons_version) + exec_script_main = "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-%s'), join(sys.prefix, 'scons-%s'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons') ] + sys.path; import SCons.Script; SCons.Script.main()" % (self.scons_version, self.scons_version) exec_script_main_xml = string.replace(exec_script_main, "'", "'") result = string.replace(input, r'<WORKPATH>', workpath) |