From 5262bacf4a595dec66e24edd4672e2d2012e8360 Mon Sep 17 00:00:00 2001
From: terelius <terelius@webrtc.org>
Date: Tue, 26 Apr 2016 08:55:35 -0700
Subject: [PATCH] Disable flaky test on msan

BUG=webrtc:5824

Review URL: https://codereview.webrtc.org/1916713004

Cr-Commit-Position: refs/heads/master@{#12512}
---
 webrtc/base/sharedexclusivelock_unittest.cc | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/webrtc/base/sharedexclusivelock_unittest.cc b/webrtc/base/sharedexclusivelock_unittest.cc
index bf75b31bec..585f7ae6f4 100644
--- a/webrtc/base/sharedexclusivelock_unittest.cc
+++ b/webrtc/base/sharedexclusivelock_unittest.cc
@@ -18,6 +18,16 @@
 #include "webrtc/base/thread.h"
 #include "webrtc/base/timeutils.h"
 
+#if defined(MEMORY_SANITIZER)
+// Flaky under MemorySanitizer, see
+// https://bugs.chromium.org/p/webrtc/issues/detail?id=5824
+#define MAYBE_TestSharedExclusive DISABLED_TestSharedExclusive
+#define MAYBE_TestExclusiveExclusive DISABLED_TestExclusiveExclusive
+#else
+#define MAYBE_TestSharedExclusive TestSharedExclusive
+#define MAYBE_TestExclusiveExclusive TestExclusiveExclusive
+#endif
+
 namespace rtc {
 
 static const uint32_t kMsgRead = 0;
@@ -158,7 +168,7 @@ TEST_F(SharedExclusiveLockTest, TestSharedShared) {
   EXPECT_LE(reader1.waiting_time_in_ms(), kNoWaitThresholdInMs);
 }
 
-TEST_F(SharedExclusiveLockTest, TestSharedExclusive) {
+TEST_F(SharedExclusiveLockTest, MAYBE_TestSharedExclusive) {
   bool done;
   WriteTask writer(shared_exclusive_lock_.get(), &value_, &done);
 
@@ -197,7 +207,7 @@ TEST_F(SharedExclusiveLockTest, TestExclusiveShared) {
   EXPECT_GE(reader.waiting_time_in_ms(), kWaitThresholdInMs);
 }
 
-TEST_F(SharedExclusiveLockTest, TestExclusiveExclusive) {
+TEST_F(SharedExclusiveLockTest, MAYBE_TestExclusiveExclusive) {
   bool done;
   WriteTask writer(shared_exclusive_lock_.get(), &value_, &done);