diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-22 00:59:35 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-22 00:59:35 (GMT) |
| commit | af7ae3e0489ca6f58a2581add0ceb7da4e7ccf0d (patch) | |
| tree | f04bbc9e297aed126b42b78009bdd43fb2dae1e5 /test | |
| parent | 6db60dbe1c3dc28f24bfca48135bcb4bc9bd66d6 (diff) | |
| download | SCons-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')
| -rw-r--r-- | test/CC/CCVERSION.py | 3 | ||||
| -rw-r--r-- | test/CXX/CXXVERSION.py | 2 | ||||
| -rw-r--r-- | test/Configure/custom-tests.py | 2 | ||||
| -rw-r--r-- | test/Copy-Symlinks.py | 3 | ||||
| -rw-r--r-- | test/FindSourceFiles.py | 3 |
5 files changed, 10 insertions, 3 deletions
diff --git a/test/CC/CCVERSION.py b/test/CC/CCVERSION.py index ac28e38..f785ddc 100644 --- a/test/CC/CCVERSION.py +++ b/test/CC/CCVERSION.py @@ -33,7 +33,8 @@ _exe = TestSCons._exe test = TestSCons.TestSCons() - +if sys.platform == 'win32': + test.skip_test('CCVERSION not set with MSVC, skipping test.') test.write("versioned.py", """import os 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", diff --git a/test/Configure/custom-tests.py b/test/Configure/custom-tests.py index f79ea0d..687ba48 100644 --- a/test/Configure/custom-tests.py +++ b/test/Configure/custom-tests.py @@ -180,7 +180,7 @@ scons: Configure: Display of random string ... scons: Configure: \(cached\) a random string scons: Configure: Display of empty string ... -scons: Configure: \(cached\). +scons: Configure: \(cached\) * scons: Configure: Display of dictionary ... scons: Configure: \(cached\) yes diff --git a/test/Copy-Symlinks.py b/test/Copy-Symlinks.py index f8f92d7..31b2a71 100644 --- a/test/Copy-Symlinks.py +++ b/test/Copy-Symlinks.py @@ -38,6 +38,9 @@ SCons.Defaults.DefaultEnvironment( tools = [] ) test = TestSCons.TestSCons() +if sys.platform == 'win32': + test.skip_test('No symlink-copying (yet) on Windows, skipping test.') + filelinkToCopy = 'filelinkToCopy' fileToLink = 'file.in' fileContents = 'stuff n things\n' diff --git a/test/FindSourceFiles.py b/test/FindSourceFiles.py index 3ba542b..88b9d7e 100644 --- a/test/FindSourceFiles.py +++ b/test/FindSourceFiles.py @@ -28,12 +28,13 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test Environment's FindSourceFiles method. """ +import sys import TestSCons test = TestSCons.TestSCons() package_format = "src_tarbz2" -if not test.where_is('tar'): +if not test.where_is('tar') or sys.platform == 'win32': if not test.where_is('zip'): test.skip_test("neither 'tar' nor 'zip' found; skipping test\n") package_format = "src_zip" |