summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-30 16:40:30 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-30 16:40:30 +0000
commite67080caa4b86b3858e2c56a115f1d3e7f2ba1c7 (patch)
tree5ec2d907a5177e2b48fc7d3cef3f087933ba7cdf /webkit
parent076bf500c06a2ec9ce9f5accc0eaad7c0b0b2666 (diff)
downloadchromium_src-e67080caa4b86b3858e2c56a115f1d3e7f2ba1c7.zip
chromium_src-e67080caa4b86b3858e2c56a115f1d3e7f2ba1c7.tar.gz
chromium_src-e67080caa4b86b3858e2c56a115f1d3e7f2ba1c7.tar.bz2
Support valgrinding layout tests.
Also suppress several common memory leak reports; http://crbug.com/9450 http://crbug.com/9458 http://crbug.com/9475 http://crbug.com/9503 Review URL: http://codereview.chromium.org/55034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/valgrind/suppressions.txt7
-rw-r--r--webkit/tools/layout_tests/layout_package/test_shell_thread.py8
2 files changed, 14 insertions, 1 deletions
diff --git a/webkit/data/valgrind/suppressions.txt b/webkit/data/valgrind/suppressions.txt
new file mode 100644
index 0000000..62d7cc7
--- /dev/null
+++ b/webkit/data/valgrind/suppressions.txt
@@ -0,0 +1,7 @@
+{
+ # See http://crbug.com/9450
+ v8_bindings_leak_crbug_9450
+ Memcheck:Leak
+ fun:_Znwj
+ fun:_ZN7WebCore7V8Proxy20RegisterGlobalHandleENS_16GlobalHandleTypeEPvN2v810PersistentINS3_5ValueEEE
+}
diff --git a/webkit/tools/layout_tests/layout_package/test_shell_thread.py b/webkit/tools/layout_tests/layout_package/test_shell_thread.py
index 73af63b..902aec3 100644
--- a/webkit/tools/layout_tests/layout_package/test_shell_thread.py
+++ b/webkit/tools/layout_tests/layout_package/test_shell_thread.py
@@ -102,7 +102,13 @@ def ProcessOutput(proc, filename, test_uri, test_types, test_args, target):
def StartTestShell(command, args):
"""Returns the process for a new test_shell started in layout-tests mode."""
- cmd = command + ['--layout-tests'] + args
+ cmd = []
+ # Hook for injecting valgrind or other runtime instrumentation,
+ # used by e.g. tools/valgrind/valgrind_tests.py.
+ wrapper = os.environ["BROWSER_WRAPPER"]
+ if wrapper != None:
+ cmd += [wrapper]
+ cmd += command + ['--layout-tests'] + args
return subprocess.Popen(cmd,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,