summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 16:57:45 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 16:57:45 +0000
commit807c01ae2f590bc809312e9be809baa6ac38d5c7 (patch)
tree6fb7678efd51e4fe3db8a6df45b3c300188a3cb0 /tools
parentfd4d226549034acc7b249e0eff537089bd0cd6db (diff)
downloadchromium_src-807c01ae2f590bc809312e9be809baa6ac38d5c7.zip
chromium_src-807c01ae2f590bc809312e9be809baa6ac38d5c7.tar.gz
chromium_src-807c01ae2f590bc809312e9be809baa6ac38d5c7.tar.bz2
SPDY: Fix unittest-only leak.
We leaked the SpdySessionPool and SpdySession in the test since they have a circular reference. This is usually broken by a GOAWAY frame in real code, but we have to manually break the circular reference here. BUG=42084 Review URL: http://codereview.chromium.org/1695001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/heapcheck/suppressions.txt6
-rw-r--r--tools/valgrind/memcheck/suppressions_linux.txt36
-rw-r--r--tools/valgrind/memcheck/suppressions_mac.txt18
3 files changed, 0 insertions, 60 deletions
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 6ebe34f..2204075 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -337,12 +337,6 @@
fun:TestSuite::Run
}
{
- bug_42084
- Heapcheck:Leak
- ...
- fun:net::::SpdySessionTest_*::TestBody
-}
-{
bug_42153
Heapcheck:Leak
fun:::InitPersonalInfo
diff --git a/tools/valgrind/memcheck/suppressions_linux.txt b/tools/valgrind/memcheck/suppressions_linux.txt
deleted file mode 100644
index 94a8f5f..0000000
--- a/tools/valgrind/memcheck/suppressions_linux.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# There are three kinds of suppressions in this file:
-# 1. Third party stuff we have no control over.
-#
-# 2. Intentional unit test errors, stuff that is somehow a false positive
-# in our own code, or stuff that is so trivial it's not worth fixing.
-#
-# 3. Suppressions for real chromium bugs that are not yet fixed.
-# These should all be in chromium's bug tracking system.
-# Periodically we should sweep this file and the bug tracker clean by
-# running overnight and removing outdated bugs/suppressions.
-#-----------------------------------------------------------------------
-
-# 1. Third party stuff we have no control over.
-
-
-# 2. Intentional unit test errors, stuff that is somehow a false positive
-# in our own code, or stuff that is so trivial it's not worth fixing.
-
-
-# 3. Suppressions for real chromium bugs that are not yet fixed.
-{
- # ChromeOS and Linux version have slightly different signatures, hence the
- # wildcard on part.
- bug_42084
- Memcheck:Leak
- fun:_Znw*
- fun:_ZN3net62_GLOBAL__N_net_spdy_spdy_session_unittest.cc_00000000*
- fun:_ZN3net62_GLOBAL__N_net_spdy_spdy_session_unittest.cc_00000000*
- fun:_ZN7testing4Test3RunEv
- fun:_ZN7testing8internal12TestInfoImpl3RunEv
- fun:_ZN7testing8TestCase3RunEv
- fun:_ZN7testing8internal12UnitTestImpl11RunAllTestsEv
- fun:_ZN7testing8UnitTest3RunEv
- fun:_ZN9TestSuite3RunEv
- fun:main
-}
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index 8a27ae6..e8defbc 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -1024,21 +1024,3 @@
fun:_ZN4base19MessagePumpLibevent3RunEPNS_11MessagePump8DelegateE
fun:_ZN11MessageLoop11RunInternalEv
}
-{
- # The two patterns differ only in one frame:
- # fun:_ZN3net15SpdySessionPool14AddSessionListERKNS_12HostPortPairE
- # so include '...' to handle that.
- bug_42084
- Memcheck:Leak
- fun:_Znw*
- ...
- fun:_ZN3net15SpdySessionPool3GetERKNS_12HostPortPairEPNS_18HttpNetworkSessionE
- fun:_ZN3net12_GLOBAL__N_127SpdySessionTest_GoAway_Test8TestBodyEv
- fun:_ZN7testing4Test3RunEv
- fun:_ZN7testing8internal12TestInfoImpl3RunEv
- fun:_ZN7testing8TestCase3RunEv
- fun:_ZN7testing8internal12UnitTestImpl11RunAllTestsEv
- fun:_ZN7testing8UnitTest3RunEv
- fun:_ZN9TestSuite3RunEv
- fun:main
-}