Comments
Patch
@@ -1013,16 +1013,17 @@ class TestRunner(object):
self._createdfiles = []
def run(self, args):
"""Run the test suite."""
# Be kind and try to clean up after ourselves.
oldenv = dict(os.environ)
try:
+ self._checktools()
tests = self.findtests(args)
return self._run(tests)
finally:
os.environ.clear()
os.environ.update(oldenv)
def _run(self, tests):
@@ -1441,17 +1442,17 @@ class TestRunner(object):
def _findprogram(self, program):
"""Search PATH for a executable program"""
for p in os.environ.get('PATH', os.defpath).split(os.pathsep):
name = os.path.join(p, program)
if os.name == 'nt' or os.access(name, os.X_OK):
return name
return None
- def checktools(self):
+ def _checktools(self):
# Before we go any further, check for pre-requisite tools
# stuff from coreutils (cat, rm, etc) are not tested
for p in self.REQUIREDTOOLS:
if os.name == 'nt' and not p.endswith('.exe'):
p += '.exe'
found = self._findprogram(p)
if found:
vlog("# Found prerequisite", p, "at", found)
@@ -1461,14 +1462,12 @@ class TestRunner(object):
def main(args, runner=None, parser=None):
runner = runner or TestRunner()
parser = parser or getparser()
(options, args) = parseargs(args, parser)
runner.options = options
os.umask(022)
- runner.checktools()
-
return runner.run(args)
if __name__ == '__main__':
sys.exit(main(sys.argv[1:]))