summaryrefslogtreecommitdiffstats
path: root/test/FindSourceFiles.py
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/FindSourceFiles.py
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/FindSourceFiles.py')
-rw-r--r--test/FindSourceFiles.py3
1 files changed, 2 insertions, 1 deletions
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"