summaryrefslogtreecommitdiffstats
path: root/test/sconsign
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2009-02-21 17:22:56 (GMT)
committerSteven Knight <knight@baldmt.com>2009-02-21 17:22:56 (GMT)
commitfe90e08dfad391d01a7a5942d9d155d45b1fcf77 (patch)
tree3050fa8d27fadd0acbecdaea33c4bc31ee7a114f /test/sconsign
parent88c7995942cbf4af6a26f42ede8e940ff59c23e5 (diff)
downloadSCons-fe90e08dfad391d01a7a5942d9d155d45b1fcf77.zip
SCons-fe90e08dfad391d01a7a5942d9d155d45b1fcf77.tar.gz
SCons-fe90e08dfad391d01a7a5942d9d155d45b1fcf77.tar.bz2
Merged revisions 4025-4029 via svnmerge from
http://scons.tigris.org/svn/scons/branches/vs_revamp ........ r4025 | stevenknight | 2009-02-19 22:47:45 -0800 (Thu, 19 Feb 2009) | 2 lines Remove the MSVCCommon directory itself. ........ r4026 | stevenknight | 2009-02-20 06:37:55 -0800 (Fri, 20 Feb 2009) | 7 lines Since we're now treating Pro and Express editions as just separate versions, use the actual Visual Studio executable, not the .bat file, to decide if a version is installed. Add separate tests scripts for executing the Express editions. Add (untested) 9.0 and 9.0Exp test scripts, cut-and-paste from 8.0 and 8.0Exp. Ignore generated *.py[co] files in the Tool/MSCommon directory. ........ r4027 | stevenknight | 2009-02-21 06:50:58 -0800 (Sat, 21 Feb 2009) | 3 lines Escape CC and LINK path names in the expected output to match path names that contain regular expression characters (e.g. " (x86)"). ........ r4028 | stevenknight | 2009-02-21 06:56:42 -0800 (Sat, 21 Feb 2009) | 7 lines Fix devenv.com paths for VS 7.0 and 7.1 (.NET and .NET 2003). Remove unused methods. Put debug() calls under control of a SCONS_MSCOMMON_DEBUG environment variable. Regularize debug messages and make it obvious who's printing what. Rename "install_dir" methods in sdk.py to "sdk_dir" to help. ........
Diffstat (limited to 'test/sconsign')
-rw-r--r--test/sconsign/script/Configure.py2
-rw-r--r--test/sconsign/script/dblite.py5
2 files changed, 7 insertions, 0 deletions
diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py
index 607d01d..fb54dd2 100644
--- a/test/sconsign/script/Configure.py
+++ b/test/sconsign/script/Configure.py
@@ -41,6 +41,8 @@ test = TestSConsign.TestSConsign(match = TestSConsign.match_re)
CC = test.detect('CC', norm=1)
CC_dir, CC_file = os.path.split(CC)
+
+CC = re.escape(CC)
CC_dir = re.escape(os.path.normcase(CC_dir))
CC_file = re.escape(CC_file)
diff --git a/test/sconsign/script/dblite.py b/test/sconsign/script/dblite.py
index 60232de..2a53b2e 100644
--- a/test/sconsign/script/dblite.py
+++ b/test/sconsign/script/dblite.py
@@ -29,6 +29,8 @@ Verify that various ways of getting at a an sconsign file written with
the default dblite module and default .dblite suffix work correctly.
"""
+import re
+
import TestSConsign
test = TestSConsign.TestSConsign(match = TestSConsign.match_re)
@@ -37,6 +39,9 @@ CC = test.detect('CC', norm=1)
LINK = test.detect('LINK', norm=1)
if LINK is None: LINK = CC
+CC = re.escape(CC)
+LINK = re.escape(LINK)
+
test.subdir('sub1', 'sub2')
# Note: We don't use os.path.join() representations of the file names