diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 18:44:54 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 18:44:54 +0000 |
| commit | bfc0da412fe44af7bd57ae28c21bec4e605246dd (patch) | |
| tree | 162228144c4e227ec726fd95613dc3c8e9961044 | |
| parent | e02241558aa3ea8a83781da6d0151214f2470f64 (diff) | |
| download | chromium_src-bfc0da412fe44af7bd57ae28c21bec4e605246dd.zip chromium_src-bfc0da412fe44af7bd57ae28c21bec4e605246dd.tar.gz chromium_src-bfc0da412fe44af7bd57ae28c21bec4e605246dd.tar.bz2 | |
Cherrypick valgrind patch to fix thinko that kept
leak suppressions from being tallied.
BUG=17890
TEST=run sh tools/valgrind/chrome_tests.sh -t base --tool_flags="--nocleanup_on_exit" & look at <suppcounts> in valgrind.tmp/* before and after sh tools/valgrind/build-valgrind-for-chromium.sh, verify leak suppressions show up after.
Review URL: http://codereview.chromium.org/160275
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21868 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | tools/valgrind/build-valgrind-for-chromium.sh | 4 | ||||
| -rw-r--r-- | tools/valgrind/leak.patch | 18 |
2 files changed, 22 insertions, 0 deletions
diff --git a/tools/valgrind/build-valgrind-for-chromium.sh b/tools/valgrind/build-valgrind-for-chromium.sh index 652fe0b..a1fef40 100755 --- a/tools/valgrind/build-valgrind-for-chromium.sh +++ b/tools/valgrind/build-valgrind-for-chromium.sh @@ -43,6 +43,10 @@ patch -p0 < "$THISDIR"/fork.patch #wget -O longlines.patch "https://bugs.kde.org/attachment.cgi?id=35174" patch -p0 < "$THISDIR"/longlines.patch +# Work around bug http://bugs.kde.org/186790 +# "Suppression counts do not include leak suppressions" +patch -p0 < "$THISDIR"/leak.patch + # Add feature bug https://bugs.kde.org/show_bug.cgi?id=201170 # "Want --show-possible option so I can ignore the bazillion possible leaks..." #wget -O possible.patch https://bugs.kde.org/attachment.cgi?id=35559 diff --git a/tools/valgrind/leak.patch b/tools/valgrind/leak.patch new file mode 100644 index 0000000..5526f11 --- /dev/null +++ b/tools/valgrind/leak.patch @@ -0,0 +1,18 @@ +Index: coregrind/m_main.c +=================================================================== +--- coregrind/m_main.c (revision 10461) ++++ coregrind/m_main.c (working copy) +@@ -2175,11 +2186,11 @@ + if (VG_(clo_track_fds)) + VG_(show_open_fds)(); + ++ VG_TDICT_CALL(tool_fini, 0/*exitcode*/); ++ + if (VG_(needs).core_errors || VG_(needs).tool_errors) + VG_(show_all_errors)(); + +- VG_TDICT_CALL(tool_fini, 0/*exitcode*/); +- + if (VG_(clo_xml)) { + VG_(message)(Vg_UserMsg, ""); + VG_(message)(Vg_UserMsg, "</valgrindoutput>"); |