summaryrefslogtreecommitdiffstats
path: root/test/msvs.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-03-16 07:16:02 (GMT)
committerSteven Knight <knight@baldmt.com>2004-03-16 07:16:02 (GMT)
commit726790558e9e9b22ec0897ceeae5b83144197fe5 (patch)
tree391bd4bdacc955aade62b680bb213f81a0f59726 /test/msvs.py
parentd337499882865fcee240d284869525b17aed0d24 (diff)
downloadSCons-726790558e9e9b22ec0897ceeae5b83144197fe5.zip
SCons-726790558e9e9b22ec0897ceeae5b83144197fe5.tar.gz
SCons-726790558e9e9b22ec0897ceeae5b83144197fe5.tar.bz2
Fix use of MSVS_IGNORE_IDE_PATHS. Win32 fixes for various tests.
Diffstat (limited to 'test/msvs.py')
-rw-r--r--test/msvs.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/msvs.py b/test/msvs.py
index e447cb0..fb41905 100644
--- a/test/msvs.py
+++ b/test/msvs.py
@@ -274,7 +274,10 @@ test = TestSCons.TestSCons(match = TestCmd.match_re)
if sys.platform != 'win32':
test.pass_test()
-exec_script_main = "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-0.94'), join(sys.prefix, 'scons-0.94'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons') ] + sys.path; import SCons.Script; SCons.Script.main()"
+test.run(arguments = '-q -Q -f -', stdin = "import SCons; print SCons.__version__")
+version = test.stdout()[:-1]
+
+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()" % (version, version)
exec_script_main_xml = string.replace(exec_script_main, "'", "&apos;")
def substitute(input, workpath=test.workpath(), python=sys.executable):