aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-09-04 02:53:50 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-09-04 02:53:50 +0000
commit6ac8b87ca69a4c0289b0b9488b66e5ac83013d45 (patch)
treeb8dc77335a46a954c00c0d9eb644bc78794ccbf9
parent4e71ddb873bacaf44407291609fe3a6fd9bf8840 (diff)
Add --vg-arg option to clang test runner.
- Passes additional argument through to valgrind. Also, don't run valgrind with --leak-check=no by default. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80981 91177308-0d34-0410-b5e6-96231b3b80d8
-rwxr-xr-xutils/test/MultiTestRunner.py4
-rwxr-xr-xutils/test/TestRunner.py7
-rw-r--r--utils/test/TestingConfig.py1
3 files changed, 9 insertions, 3 deletions
diff --git a/utils/test/MultiTestRunner.py b/utils/test/MultiTestRunner.py
index c94f114e3c..6e15f1cd8f 100755
--- a/utils/test/MultiTestRunner.py
+++ b/utils/test/MultiTestRunner.py
@@ -257,6 +257,9 @@ def main():
group.add_option("", "--vg", dest="useValgrind",
help="Run tests under valgrind",
action="store_true", default=False)
+ group.add_option("", "--vg-arg", dest="valgrindArgs",
+ help="Specify an extra argument for valgrind",
+ type=str, action="append", default=[])
group.add_option("", "--time-tests", dest="timeTests",
help="Track elapsed wall time for each test",
action="store_true", default=False)
@@ -320,6 +323,7 @@ def main():
cfg.clang = opts.clang
cfg.clangcc = opts.clangcc
cfg.useValgrind = opts.useValgrind
+ cfg.valgrindArgs = opts.valgrindArgs
cfg.useExternalShell = opts.useExternalShell
# FIXME: It could be worth loading these in parallel with testing.
diff --git a/utils/test/TestRunner.py b/utils/test/TestRunner.py
index 3c0c8072c2..2fdede0c0d 100755
--- a/utils/test/TestRunner.py
+++ b/utils/test/TestRunner.py
@@ -149,9 +149,10 @@ def executeScript(cfg, script, commands, cwd):
if cfg.useValgrind:
# FIXME: Running valgrind on sh is overkill. We probably could just
# run on clang with no real loss.
- command = ['valgrind', '-q',
- '--tool=memcheck', '--leak-check=no', '--trace-children=yes',
- '--error-exitcode=123'] + command
+ valgrindArgs = ['valgrind', '-q',
+ '--tool=memcheck', '--trace-children=yes',
+ '--error-exitcode=123'] + cfg.valgrindArgs
+ command = valgrindArgs + command
p = subprocess.Popen(command, cwd=cwd,
stdin=subprocess.PIPE,
diff --git a/utils/test/TestingConfig.py b/utils/test/TestingConfig.py
index a43bd76560..b611d78e14 100644
--- a/utils/test/TestingConfig.py
+++ b/utils/test/TestingConfig.py
@@ -20,6 +20,7 @@ class TestingConfig:
self.root = None
self.useValgrind = None
self.useExternalShell = None
+ self.valgrindArgs = []
# FIXME: These need to move into a substitutions mechanism.
self.clang = None