From 60f235511bafcda56a5bbd8240d52d62c261dca0 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Fri, 29 Jan 2010 01:47:13 +0000 Subject: valgrind: Put back suppression 20653b the way it was. TBR=dank BUG=20653 TEST=valgrind unit tests goes green. Review URL: http://codereview.chromium.org/549199 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37480 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/valgrind/memcheck/suppressions.txt | 11 ++++------- tools/wine_valgrind/chromium-valgrind-suppressions | 10 ++++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 23dee83a..eec194a 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -177,7 +177,6 @@ fun:sendmsg fun:_ZN3IPC7Channel11ChannelImpl4SendEPNS_7MessageE } - { # "The section of the SQLite library identified works exactly as it should." # http://www.sqlite.org/cvstrac/tktview?tn=536,39 @@ -189,23 +188,21 @@ # for no reason other than pleasing valgrind, but a patch might be accepted # under a macro like SQLITE_SECURE_DELETE which could be construed to apply # to cases like this. (Note that we compile with SQLITE_SECURE_DELETE.) - bug_20653 + bug_20653a Memcheck:Param write(buf) ... fun:sqlite3OsWrite fun:pager_write_pagelist } - { - # This appears to be related to the bug_20653 suppression, the same - # header but written to the subjournal instead of at commit time. - bug_20653a + bug_20653b Memcheck:Param write(buf) ... + fun:unixWrite fun:sqlite3OsWrite - fun:subjournalPage + ... fun:pager_write } diff --git a/tools/wine_valgrind/chromium-valgrind-suppressions b/tools/wine_valgrind/chromium-valgrind-suppressions index 0f60335..cc4e2d9 100644 --- a/tools/wine_valgrind/chromium-valgrind-suppressions +++ b/tools/wine_valgrind/chromium-valgrind-suppressions @@ -247,6 +247,16 @@ fun:sqlite3OsWrite fun:pager_write_pagelist } +{ + bug_20653b + Memcheck:Param + write(buf) + ... + fun:unixWrite + fun:sqlite3OsWrite + ... + fun:pager_write +} # End of suppressions that need de-duping. { bug_30547 -- cgit v1.1