Suppress bug 6532 for -O1 as well. Move to central suppression file.

This should make the valgrind builder green again.
Valgrind ipc test child processes, too.

Review URL: http://codereview.chromium.org/93088

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14374 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 25 insertions, 1 deletions

diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 323bfe6..52106d6 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -206,7 +206,8 @@ class ChromeTests:
     return self.SimpleTest("chrome", "printing_unittests")
 
   def TestIpc(self):
-    return self.SimpleTest("chrome", "ipc_tests")
+    return self.SimpleTest("chrome", "ipc_tests",
+                           valgrind_test_args=["--trace_children"])
 
   def TestNet(self):
     return self.SimpleTest("net", "net_unittests")
diff --git a/tools/valgrind/suppressions.txt b/tools/valgrind/suppressions.txt
index 20c2979..5f844ca 100644
--- a/tools/valgrind/suppressions.txt
+++ b/tools/valgrind/suppressions.txt
@@ -318,6 +318,29 @@
    fun:_ZN14RunnableMethodI19DownloadFileManagerMS0_FviP14DownloadBufferE6Tuple2IiS2_EE3RunEv
 }
 {
+   # Chromium flakily leaks tasks at shutdown, see
+   # http://crbug.com/6532
+   # http://codereview.chromium.org/20067
+   # http://codereview.chromium.org/42083
+   # To reproduce, run ipc tests
+   # This is the -O0 case
+   # In Purify, they don't even try to free them anymore.
+   # For now, in Valgrind, we'll add suppressions to ignore these leaks.
+   bug_6532
+   Memcheck:Leak
+   fun:_Znwj
+   fun:_Z17NewRunnableMethodIN3IPC12ChannelProxy7ContextEMS2_FvvEEP14CancelableTaskPT_T0_
+}
+{
+   # See http://crbug.com/6532
+   # This is the -O1 case
+   bug_6532b
+   Memcheck:Leak
+   fun:_Znwj
+   fun:_ZN3IPC12ChannelProxy7Context14OnChannelErrorEv
+   fun:_ZN3IPC7Channel11ChannelImpl28OnFileCanReadWithoutBlockingEi
+}
+{
    # See http://crbug.com/9450
    v8_bindings_leak_crbug_9450
    Memcheck:Leak