diff options
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 ac28e380..f785ddc2 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 8433aa61..60170015 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 f79ea0d4..687ba489 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 f8f92d74..31b2a712 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 3ba542bd..88b9d7e4 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" |