summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 00:05:19 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 00:05:19 +0000
commit3f3748f6e2617edb4f206595f993f99c6577c633 (patch)
tree2233996ead2d3821b1629642376261120c0d2c74 /net
parent6a186346bcd8c0497ead0cae919b21e87df173c8 (diff)
downloadchromium_src-3f3748f6e2617edb4f206595f993f99c6577c633.zip
chromium_src-3f3748f6e2617edb4f206595f993f99c6577c633.tar.gz
chromium_src-3f3748f6e2617edb4f206595f993f99c6577c633.tar.bz2
Moving the disable test to correct file.
BUG=59642 TEST=win32 tsan bot goes green. Review URL: http://codereview.chromium.org/3808011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/data/valgrind/net_unittests.gtest-tsan_win32.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/data/valgrind/net_unittests.gtest-tsan_win32.txt b/net/data/valgrind/net_unittests.gtest-tsan_win32.txt
index 8f35ff1..b7b6e2c 100644
--- a/net/data/valgrind/net_unittests.gtest-tsan_win32.txt
+++ b/net/data/valgrind/net_unittests.gtest-tsan_win32.txt
@@ -21,6 +21,9 @@ ClientSocketPoolBaseTest.CancelPendingSocketAtSocketLimit
HttpNetworkTransactionTest.*
HttpNetworkLayerTest.GET
+# Timing out under TSan, see http://crbug.com/59642
+CookieMonsterTest.GarbageCollectionTriggers
+
#########################################
# These tests fail if you don't have our SSL certificate installed.
# Please see http://dev.chromium.org/developers/testing#TOC-SSL-tests