summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-11 21:03:51 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-11 21:03:51 +0000
commit1e90fe867a2a1a34abee0434ea7a1f19737c6769 (patch)
treead67d2959a926b70b1c290782de6a1337a9169e6
parent5a7bba01db74c0cd9e65793ac4bc757e7b5eedcf (diff)
downloadchromium_src-1e90fe867a2a1a34abee0434ea7a1f19737c6769.zip
chromium_src-1e90fe867a2a1a34abee0434ea7a1f19737c6769.tar.gz
chromium_src-1e90fe867a2a1a34abee0434ea7a1f19737c6769.tar.bz2
Disable another racy HostResolverImplTest under tsan.
BUG=268946 TBR=szym@chromium.org Review URL: https://codereview.chromium.org/135693002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244359 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/dns/host_resolver_impl_unittest.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/net/dns/host_resolver_impl_unittest.cc b/net/dns/host_resolver_impl_unittest.cc
index 5d19fdc..1eb4ee0 100644
--- a/net/dns/host_resolver_impl_unittest.cc
+++ b/net/dns/host_resolver_impl_unittest.cc
@@ -621,7 +621,16 @@ TEST_F(HostResolverImplTest, EmptyHost) {
EXPECT_EQ(ERR_NAME_NOT_RESOLVED, req->Resolve());
}
-TEST_F(HostResolverImplTest, EmptyDotsHost) {
+#if defined(THREAD_SANITIZER)
+// There's a data race in this test that may lead to use-after-free.
+// If the test starts to crash without ThreadSanitizer it needs to be disabled
+// globally. See http://crbug.com/268946 (stacks for this test in
+// crbug.com/333567).
+#define MAYBE_EmptyDotsHost DISABLED_EmptyDotsHost
+#else
+#define MAYBE_EmptyDotsHost EmptyDotsHost
+#endif
+TEST_F(HostResolverImplTest, MAYBE_EmptyDotsHost) {
for (int i = 0; i < 16; ++i) {
Request* req = CreateRequest(std::string(i, '.'), 5555);
EXPECT_EQ(ERR_NAME_NOT_RESOLVED, req->Resolve());