summaryrefslogtreecommitdiffstats
path: root/QMTest/TestCommon.py
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2011-02-13 19:27:20 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2011-02-13 19:27:20 (GMT)
commit18097a7686a70d499f8fc83001bf517b06a61864 (patch)
tree9ae7588527a58bbc44eb5af1efed3632b652f45d /QMTest/TestCommon.py
parent2314323fb1826ab4e1950fe79637292a9e19d9a5 (diff)
downloadSCons-18097a7686a70d499f8fc83001bf517b06a61864.zip
SCons-18097a7686a70d499f8fc83001bf517b06a61864.tar.gz
SCons-18097a7686a70d499f8fc83001bf517b06a61864.tar.bz2
Apply patch from issue #2710. Test harness fixes only, no user impact (no doc/changelog). Predecessor to fixing #2708.
Diffstat (limited to 'QMTest/TestCommon.py')
-rw-r--r--QMTest/TestCommon.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/QMTest/TestCommon.py b/QMTest/TestCommon.py
index 37d3f9c..c677226 100644
--- a/QMTest/TestCommon.py
+++ b/QMTest/TestCommon.py
@@ -417,7 +417,7 @@ class TestCommon(TestCmd):
if any of the files does not exist.
"""
files = [is_List(x) and os.path.join(*x) or x for x in files]
- missing = [x for x in files if not os.path.exists(x)]
+ missing = [x for x in files if not os.path.exists(x) and not os.path.islink(x) ]
if missing:
print "Missing files: `%s'" % "', `".join(missing)
self.fail_test(missing)
@@ -493,7 +493,7 @@ class TestCommon(TestCmd):
Exits FAILED if any of the files exists.
"""
files = [is_List(x) and os.path.join(*x) or x for x in files]
- existing = list(filter(os.path.exists, files))
+ existing = [x for x in files if os.path.exists(x) or os.path.islink(x)]
if existing:
print "Unexpected files exist: `%s'" % "', `".join(existing)
self.fail_test(existing)