From 3b2fbfd9f78110d417f1d3c8cbf69386c3d41ea8 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Sat, 27 Sep 2008 14:28:11 +0000 Subject: [PATCH] Fix scons-local packaging test breakage in MSVS tests by correcting the spelling of TestSCons._scons_version to TestSCons.scons_version. git-svn-id: http://scons.tigris.org/svn/scons/trunk@3492 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- QMTest/TestSConsMSVS.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QMTest/TestSConsMSVS.py b/QMTest/TestSConsMSVS.py index bb5fac46..7d9e9a01 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) -- 2.26.2