summaryrefslogtreecommitdiffstats
path: root/test/CXX
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2014-08-22 00:59:35 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2014-08-22 00:59:35 (GMT)
commitaf7ae3e0489ca6f58a2581add0ceb7da4e7ccf0d (patch)
treef04bbc9e297aed126b42b78009bdd43fb2dae1e5 /test/CXX
parent6db60dbe1c3dc28f24bfca48135bcb4bc9bd66d6 (diff)
downloadSCons-af7ae3e0489ca6f58a2581add0ceb7da4e7ccf0d.zip
SCons-af7ae3e0489ca6f58a2581add0ceb7da4e7ccf0d.tar.gz
SCons-af7ae3e0489ca6f58a2581add0ceb7da4e7ccf0d.tar.bz2
Fixed or skipped tests that fail on Windows.
Mostly just per-test changes, but also made match_re strip out CR (\r) chars at end of lines to make Windows match properly.
Diffstat (limited to 'test/CXX')
-rw-r--r--test/CXX/CXXVERSION.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/CXX/CXXVERSION.py b/test/CXX/CXXVERSION.py
index 8433aa6..6017001 100644
--- a/test/CXX/CXXVERSION.py
+++ b/test/CXX/CXXVERSION.py
@@ -33,6 +33,8 @@ _exe = TestSCons._exe
test = TestSCons.TestSCons()
+if sys.platform == 'win32':
+ test.skip_test('CXXVERSION not set with MSVC, skipping test.')
test.write("versioned.py",