generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase webrtc/base with r6250:

Browse Source 
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
This commit is contained in:
henrike@webrtc.org 2014-05-29 15:53:39 +00:00
parent 5dc51fbe50
commit caa01b172e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/base/sharedexclusivelock_unittest.cc
View File

@ -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);