MultiTestRunner: Reenable --vg option.
- Simplified from before and using --error-exitcode so failures show up as
failures.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77424 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/test/TestRunner.py b/utils/test/TestRunner.py
index 9aae55c..854d60b 100755
--- a/utils/test/TestRunner.py
+++ b/utils/test/TestRunner.py
@@ -57,7 +57,7 @@
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':
@@ -71,6 +71,12 @@
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,
@@ -87,7 +93,7 @@
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)
@@ -149,7 +155,8 @@
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]