11 files changed, 4 insertions, 193 deletions
diff --git a/net/data/valgrind/DIRECTORY_MOVED b/net/data/valgrind/DIRECTORY_MOVED
new file mode 100644
index 0000000..96449fe
--- /dev/null
+++ b/net/data/valgrind/DIRECTORY_MOVED
@@ -0,0 +1,4 @@
+For those who got a merge conflict in this directory on update:
+The files from this dir has been moved to tools/valgrind/gtest_exclude
+
+TODO(timurrrr): remove this in a couple of weeks
diff --git a/net/data/valgrind/net_unittests.gtest-drmemory_win32.txt b/net/data/valgrind/net_unittests.gtest-drmemory_win32.txt
deleted file mode 100644
index 10b8617..0000000
--- a/net/data/valgrind/net_unittests.gtest-drmemory_win32.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# See http://crbug.com/51145
-HttpNetworkTransactionTest.*
-HttpNetworkLayerTest.GET
-
-# TODO(timurrrr): investigate these
-ClientSocketPoolBaseTest.*
-SSLClientSocketTest.*
-ProxyResolverJS*
-X509CertificateTest.*
-UrlToFilenameEncoderTest.*
-DirectoryListerTest.*
-WebSocketHandshake*
-HTTPSRequestTest.*
-NetUtilTest.*
diff --git a/net/data/valgrind/net_unittests.gtest-memcheck.txt b/net/data/valgrind/net_unittests.gtest-memcheck.txt
deleted file mode 100644
index e7f42dd..0000000
--- a/net/data/valgrind/net_unittests.gtest-memcheck.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# These tests leak data intentionally, so are inappropriate for Valgrind tests.
-# Similar list in ../purify/net_unittests.exe.gtest.txt
-# TODO(dkegel): either merge the two files or keep them in sync,
-# see http://code.google.com/p/chromium/issues/detail?id=8951
-DiskCacheBackendTest.AppCacheInvalidEntry
-DiskCacheBackendTest.AppCacheInvalidEntryRead
-DiskCacheBackendTest.AppCacheInvalidEntryWithLoad
-DiskCacheBackendTest.InvalidEntry
-DiskCacheBackendTest.InvalidEntryRead
-DiskCacheBackendTest.InvalidEntryWithLoad
-DiskCacheBackendTest.TrimInvalidEntry
-DiskCacheBackendTest.TrimInvalidEntry2
-DiskCacheBackendTest.InvalidEntryEnumeration
-DiskCacheBackendTest.NewEvictionInvalidEntry
-DiskCacheBackendTest.NewEvictionInvalidEntryRead
-DiskCacheBackendTest.NewEvictionInvalidEntryWithLoad
-DiskCacheBackendTest.NewEvictionTrimInvalidEntry
-DiskCacheBackendTest.NewEvictionTrimInvalidEntry2
-DiskCacheBackendTest.NewEvictionInvalidEntryEnumeration
diff --git a/net/data/valgrind/net_unittests.gtest-tsan.txt b/net/data/valgrind/net_unittests.gtest-tsan.txt
deleted file mode 100644
index 1ddf884..0000000
--- a/net/data/valgrind/net_unittests.gtest-tsan.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# These huge tests are flaky and sometimes crash the following tests.
-# See http://crbug.com/50346
-DiskCacheEntryTest.*HugeSparse*
-
-# SPDY tests tend to crash on both Mac and Windows.
-# See http://crbug.com/51144
-Spdy/SpdyNetworkTransactionTest.SocketWriteReturnsZero*
-# See http://crbug.com/50918
-Spdy/SpdyNetworkTransactionTest.CancelledTransactionSendRst*
-# See http://crbug.com/51087
-Spdy*
-
-# See http://crbug.com/44570
-HttpNetworkTransactionTest.StopsReading204
-# See http://crbug.com/51145
-HttpNetworkTransactionTest.Incomplete100ThenEOF
-HttpNetworkTransactionTest.UseAlternateProtocolForNpnSpdyWithExistingSpdySession
-HttpNetworkTransactionTest.KeepAliveConnectionEOF
diff --git a/net/data/valgrind/net_unittests.gtest-tsan_mac.txt b/net/data/valgrind/net_unittests.gtest-tsan_mac.txt
deleted file mode 100644
index 6359e4b..0000000
--- a/net/data/valgrind/net_unittests.gtest-tsan_mac.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# WebSocketTest tests are extraordinary slow under ThreadSanitizer,
-# (see http://crbug.com/25392)
-# TODO(glider): investigate this.
-WebSocketTest.*
-
-# Strange reports from __NSThread__main__ appeared with the new TSan binaries
-# See http://crbug.com/38926
-DirectoryLister*
diff --git a/net/data/valgrind/net_unittests.gtest-tsan_win32.txt b/net/data/valgrind/net_unittests.gtest-tsan_win32.txt
deleted file mode 100644
index b7b6e2c..0000000
--- a/net/data/valgrind/net_unittests.gtest-tsan_win32.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# These tests fail due to unknown reasons
-# TODO(timurrrr): investigate
-CookieMonsterTest.TestLastAccess
-SpdyNetwork*Error*
-SpdyNetwork*Get*
-SpdyNetworkTransactionTest.SynReplyHeadersVary
-X509CertificateTest.UnoSoftCertParsing
-URLRequestTest.DoNotSaveCookies
-URLRequestTest.QuitTest
-
-# See http://crbug.com/46647
-DiskCacheBackendTest.*
-
-# See http://crbug.com/53304
-URLRequestTest.*
-
-# See http://crbug.com/47836
-ClientSocketPoolBaseTest.CancelPendingSocketAtSocketLimit
-
-# See http://crbug.com/51145
-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
-# if you think you want to un-comment one of the following lines.
-#SSLClientSocketTest.*
-#URLRequestTest*
-#HTTPSRequestTest.*
-#X509CertificateTest.*
-#ProxyScriptFetcherTest.*
diff --git a/net/data/valgrind/net_unittests.gtest.txt b/net/data/valgrind/net_unittests.gtest.txt
deleted file mode 100644
index 0af617c..0000000
--- a/net/data/valgrind/net_unittests.gtest.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Very slow under Valgrind.
-KeygenHandlerTest.*SmokeTest
-KeygenHandlerTest.*ConcurrencyTest
-
-# Fails Valgrind with varying stack traces. http://crbug.com/43179
-SpdyNetworkTransactionTest.PostWithEarlySynReply
diff --git a/net/data/valgrind/net_unittests.gtest_linux.txt b/net/data/valgrind/net_unittests.gtest_linux.txt
deleted file mode 100644
index 1b69eec..0000000
--- a/net/data/valgrind/net_unittests.gtest_linux.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# These tests fail due to certificate errors; see http://crbug.com/36770
-HTTPSRequestTest.HTTPSMismatchedTest
-SSLClientSocketTest.ConnectMismatched
diff --git a/net/data/valgrind/net_unittests.gtest_mac.txt b/net/data/valgrind/net_unittests.gtest_mac.txt
deleted file mode 100644
index 57f2365..0000000
--- a/net/data/valgrind/net_unittests.gtest_mac.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Very slow under Valgrind, (see <http://crbug.com/37289>).
-KeygenHandlerTest.SmokeTest
diff --git a/net/data/valgrind/net_unittests.gtest_wine.txt b/net/data/valgrind/net_unittests.gtest_wine.txt
deleted file mode 100644
index 2492f86..0000000
--- a/net/data/valgrind/net_unittests.gtest_wine.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-# crash             Crashes in Wine
-# crash-valgrind    Crashes in Wine + Valgrind
-# dontcare          Safe to ignore
-# dontcare-hangwin  Ignore, hangs on Windows too
-# dontcare-winfail  Ignore, fails on Windows too
-# dontcare-flaky    Ignore, flaky test
-# dontcare-hang     Ignore, hangs we don't care about
-# fail              Fails, needs triaging or needs to be fixed
-# fail-valgrind     Fails only under Valgrind
-# fail_wine_vmware  Fails in Wine under VMware? TODO(dank) clarify
-# flaky-valgrind    Flaky under Valgrind, needs investigation
-# hang              Test that hangs for some reason
-# hang-valgrind     Test that hangs under valgrind, or just takes too long
-
-# fail
-http://bugs.winehq.org/show_bug.cgi?id=20748
-SSLClientSocketTest.Read_Interrupted
-
-# fail
-# https/ssl failing on the bot, bad Wine? TODO(thestig): investigate
-HTTPSRequestTest.HTTPSExpiredTest
-
-# fail
-# https/ssl failing on the bot, bad Wine? TODO(thestig): investigate
-HTTPSRequestTest.HTTPSGetTest
-
-# fail
-# https/ssl failing on the bot, bad Wine? TODO(thestig): investigate
-HTTPSRequestTest.HTTPSMismatchedTest
-
-# fail
-# https/ssl failing on the bot, bad Wine? TODO(thestig): investigate
-SSLClientSocketTest.Connect
-
-# fail
-# https/ssl failing on the bot, bad Wine? TODO(thestig): investigate
-SSLClientSocketTest.Read
-
-# fail
-# https/ssl failing on the bot, bad Wine? TODO(thestig): investigate
-SSLClientSocketTest.Read_FullDuplex
-
-# fail
-# https/ssl failing on the bot, bad Wine? TODO(thestig): investigate
-SSLClientSocketTest.Read_SmallChunks
-
-# fail
-# https/ssl failing on the bot, bad Wine? TODO(thestig): investigate
-URLRequestTestHTTP.HTTPSToHTTPRedirectNoRefererTest
diff --git a/net/data/valgrind/suppressions.txt b/net/data/valgrind/suppressions.txt
deleted file mode 100644
index e8cc210..0000000
--- a/net/data/valgrind/suppressions.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-   Test DiskCacheBackendTest.InvalidEntryEnumeration leaks.
-   Memcheck:Leak
-   fun:_Znwj
-   fun:_ZN10disk_cache12StorageBlockINS_12RankingsNodeEE12AllocateDataEv
-   fun:_ZN10disk_cache12StorageBlockINS_12RankingsNodeEE4LoadEv
-   fun:_ZN10disk_cache9EntryImpl15LoadNodeAddressEv
-   fun:_ZN10disk_cache11BackendImpl8NewEntryENS_4AddrEPPNS_9EntryImplEPb
-   fun:_ZN10disk_cache11BackendImpl10MatchEntryERKSsjb
-   fun:_ZN10disk_cache11BackendImpl9OpenEntryERKSsPPNS_5EntryE
-   fun:_ZN49DiskCacheBackendTest_InvalidEntryEnumeration_Test8TestBodyEv
-   fun:_ZN7testing4Test3RunEv
-}
-{
-   Test DiskCacheBackendTest.InvalidEntryRead leaks.
-   Memcheck:Leak
-   fun:_Znwj
-   fun:_ZN10disk_cache11BackendImpl8NewEntryENS_4AddrEPPNS_9EntryImplEPb
-   fun:_ZN10disk_cache11BackendImpl10MatchEntryERKSsjb
-   fun:_ZN10disk_cache11BackendImpl9OpenEntryERKSsPPNS_5EntryE
-   fun:_ZN42DiskCacheBackendTest_InvalidEntryRead_Test8TestBodyEv
-   fun:_ZN7testing4Test3RunEv
-}
-{
-   Test DiskCacheBackendTest.InvalidEntryWithLoad leaks.
-   Memcheck:Leak
-   fun:_Znwj
-   fun:_ZN10disk_cache11BackendImpl11CreateEntryERKSsPPNS_5EntryE
-   fun:_ZN46DiskCacheBackendTest_InvalidEntryWithLoad_Test8TestBodyEv
-   fun:_ZN7testing4Test3RunEv
-}
-{
-   Test FlipNetworkTransactionTest.WriteError Bug 29004
-   Memcheck:Leak
-   fun:_Znw*
-   ...
-   fun:_ZN3net26FlipNetworkTransactionTest17TransactionHelperERKNS_15HttpRequestInfoEPNS_17DelayedSocketDataE
-   fun:_ZN3net42FlipNetworkTransactionTest_WriteError_Test8TestBodyEv
-}