Commit 8a8824da authored by Stefan H. Holek's avatar Stefan H. Holek

Stop testrunner.py from recursing into the 'build-base' directory created by setup.py.

parent 8413ccb7
...@@ -100,6 +100,9 @@ Zope Changes ...@@ -100,6 +100,9 @@ Zope Changes
Bugs fixed Bugs fixed
- Stop testrunner.py from recursing into the 'build-base' directory
created by setup.py.
- Collector #1074: Change Scripts' __name__ to None - Collector #1074: Change Scripts' __name__ to None
- Range searches with KeywordIndexes did not work with record-style - Range searches with KeywordIndexes did not work with record-style
......
...@@ -128,9 +128,10 @@ class TestRunner: ...@@ -128,9 +128,10 @@ class TestRunner:
def listTestableNames(self, pathname): def listTestableNames(self, pathname):
"""Return a list of the names to be traversed to build tests.""" """Return a list of the names to be traversed to build tests."""
names = os.listdir(pathname) names = os.listdir(pathname)
if "build" in names: for ignore in ('build', 'build-base'):
# Don't recurse into build directories created by setup.py if ignore in names:
names.remove("build") # Don't recurse into build directories created by setup.py
names.remove(ignore)
if '.testinfo' in names: # allow local control if '.testinfo' in names: # allow local control
f = open(os.path.join(pathname, '.testinfo')) f = open(os.path.join(pathname, '.testinfo'))
lines = filter(None, f.readlines()) lines = filter(None, f.readlines())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment