- Use a timeout / ulimit
- Detect signaled failures (abort)
- Better support for finding tests
+
+ - Support "disabling" tests? The advantage of making this distinct from XFAIL
+ is it makes it more obvious that it is a temporary measure (and MTR can put
+ in a separate category).
"""
# TOD
else:
startTime = time.time()
code, output = TestRunner.runOneTest(path, base,
- opts.clang, opts.clangcc)
+ opts.clang, opts.clangcc,
+ opts.useValgrind)
elapsed = time.time() - startTime
except KeyboardInterrupt:
# This is a sad hack. Unfortunately subprocess goes
if not args:
parser.error('No inputs specified')
- if opts.useValgrind:
- parser.error('Support for running with valgrind is '
- 'temporarily disabled')
# FIXME: Move into configuration object.
TestRunner.kChildEnv["PATH"] = os.pathsep.join(opts.path +
if e.errno != errno.EEXIST:
raise
-def executeScript(script, commands, cwd):
+def executeScript(script, commands, cwd, useValgrind):
# Write script file
f = open(script,'w')
if kSystemName == 'Windows':
command = ['cmd','/c', script]
else:
command = ['/bin/sh', script]
+ if useValgrind:
+ # FIXME: Running valgrind on sh is overkill. We probably could just
+ # ron on clang with no real loss.
+ command = ['valgrind', '-q',
+ '--tool=memcheck', '--leak-check=no', '--trace-children=yes',
+ '--error-exitcode=123'] + command
p = subprocess.Popen(command, cwd=cwd,
stdin=subprocess.PIPE,
return out, err, exitCode
import StringIO
-def runOneTest(testPath, tmpBase, clang, clangcc):
+def runOneTest(testPath, tmpBase, clang, clangcc, useValgrind):
# Make paths absolute.
tmpBase = os.path.abspath(tmpBase)
testPath = os.path.abspath(testPath)
scriptLines[i] = ln[:-2]
out, err, exitCode = executeScript(script, scriptLines,
- cwd=os.path.dirname(testPath))
+ os.path.dirname(testPath),
+ useValgrind)
if xfailLines:
ok = exitCode != 0
status = (TestStatus.XPass, TestStatus.XFail)[ok]