From caa01b172e94746d1ab27070ce0b2edb2bc1ad53 Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Thu, 29 May 2014 15:53:39 +0000 Subject: [PATCH] Rebase webrtc/base with r6250: cd webrtc/base svn diff -r 6249:6250 http://webrtc.googlecode.com/svn/trunk/talk/base > 6250.diff patch -p0 -i 6250.diff BUG=3379 TBR=phoglund@webrtc.org Review URL: https://webrtc-codereview.appspot.com/16589004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6271 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/base/sharedexclusivelock_unittest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webrtc/base/sharedexclusivelock_unittest.cc b/webrtc/base/sharedexclusivelock_unittest.cc index de1dbe8122..42334af755 100644 --- a/webrtc/base/sharedexclusivelock_unittest.cc +++ b/webrtc/base/sharedexclusivelock_unittest.cc @@ -131,7 +131,8 @@ class SharedExclusiveLockTest int value_; }; -TEST_F(SharedExclusiveLockTest, TestSharedShared) { +// Flaky: https://code.google.com/p/webrtc/issues/detail?id=3318 +TEST_F(SharedExclusiveLockTest, DISABLED_TestSharedShared) { int value0, value1; bool done0, done1; ReadTask reader0(shared_exclusive_lock_.get(), &value_, &done0);