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

Rebase webrtc/base with r6555 version of talk/base:

Browse Source 
cd webrtc/base
svn diff -r 6521:6555 http://webrtc.googlecode.com/svn/trunk/talk/base >
6555.diff
patch -p0 -i 6555.diff

BUG=3379
TBR=aluebs@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/18629004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6556 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-06-27 16:21:49 +00:00
parent bfa758a54c
commit 6f833c332c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/base/physicalsocketserver_unittest.cc
View File

@ -130,10 +130,16 @@ TEST_F(PhysicalSocketTest, TestUdpIPv6) {
SocketTest::TestUdpIPv6();
}
// Disable for TSan v2, see
// https://code.google.com/p/webrtc/issues/detail?id=3498 for details.
#if !defined(THREAD_SANITIZER)
TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv4) {
SocketTest::TestUdpReadyToSendIPv4();
}
#endif // if !defined(THREAD_SANITIZER)
TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv6) {
SocketTest::TestUdpReadyToSendIPv6();
}