Index: webrtc/base/sharedexclusivelock_unittest.cc |
diff --git a/webrtc/base/sharedexclusivelock_unittest.cc b/webrtc/base/sharedexclusivelock_unittest.cc |
index 9b64ed760afa89b2551d47355a46cc0e8299cac1..f1eabd5a8adb8ddbd5e26a9812fd84a2fda58cfe 100644 |
--- a/webrtc/base/sharedexclusivelock_unittest.cc |
+++ b/webrtc/base/sharedexclusivelock_unittest.cc |
@@ -17,6 +17,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; |
@@ -157,7 +167,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); |
@@ -196,7 +206,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); |