From 42480743cfd74847e0bcf3c656cab2db6077d52d Mon Sep 17 00:00:00 2001
From: "stuartmorgan@chromium.org"
 <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 12 Aug 2010 20:15:09 +0000
Subject: Add suppression for pwrite64 of unititialized memory in
 AppCacheUITest

Also fixes the presubmit check so that it doesn't fail Memcheck:Param suppressions, since it currently prevents this change.

BUG=51940
TEST=Greener valgrind bots

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55922 0039d316-1c4b-4281-b951-d872f2087c98
---
 tools/valgrind/memcheck/PRESUBMIT.py     |  6 +++---
 tools/valgrind/memcheck/suppressions.txt | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'tools')

diff --git a/tools/valgrind/memcheck/PRESUBMIT.py b/tools/valgrind/memcheck/PRESUBMIT.py
index b026139..a31a596 100755
--- a/tools/valgrind/memcheck/PRESUBMIT.py
+++ b/tools/valgrind/memcheck/PRESUBMIT.py
@@ -21,15 +21,15 @@ def CheckChange(input_api, output_api):
     if skip_next_line:
       skip_next_line = False
       continue
+    if line == '{' or line == "Memcheck:Param":
+      skip_next_line = True
+      continue
     if (line.startswith('fun:') or line.startswith('obj:') or
         line.startswith('Memcheck:') or line == '}' or
         line == '...'):
       continue
     if func_re.match(line):
       continue
-    if line == '{':
-      skip_next_line = True
-      continue
     errors.append('"%s" is probably wrong: %s line %s' % (line, f.LocalPath(),
                                                           line_num))
   if errors:
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 20fbb3a..fdd9cc9 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -4103,3 +4103,16 @@
    fun:_ZN9TestShell21BindJSObjectsToWindowEPN6WebKit8WebFrameE
    fun:_ZN19TestWebViewDelegate20didClearWindowObjectEPN6WebKit8WebFrameE
 }
+{
+   bug_51940
+   Memcheck:Param
+   pwrite64(buf)
+   fun:pwrite64
+   fun:_ZN10disk_cache4File5WriteEPKvjj
+   fun:_ZN10disk_cache4File5WriteEPKvjjPNS_14FileIOCallbackEPb
+   fun:_ZN10disk_cache9EntryImpl5FlushEiib
+   fun:_ZN10disk_cache9EntryImplD0Ev
+   fun:_ZN4base10RefCountedIN10disk_cache9EntryImplEE7ReleaseEv
+   fun:_ZN10disk_cache9BackendIO23ExecuteBackendOperationEv
+   fun:_ZN10disk_cache9BackendIO16ExecuteOperationEv
+}
-- 
cgit v1.1