| commit | 6f833c332cbe3fcc744f5d8a05d9cc2168571a71 | [log] [tgz] |
|---|---|---|
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Fri Jun 27 16:21:49 2014 +0000 |
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Fri Jun 27 16:21:49 2014 +0000 |
| tree | b1375c081fa0301f0f09b3f6c9ebcbe8392451c3 | |
| parent | bfa758a54c066f4d0bb125e102fbb654ee177a88 [diff] [blame] |
Rebase webrtc/base with r6555 version of talk/base: 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
diff --git a/webrtc/base/physicalsocketserver_unittest.cc b/webrtc/base/physicalsocketserver_unittest.cc index f29c5fc..df750ad 100644 --- a/webrtc/base/physicalsocketserver_unittest.cc +++ b/webrtc/base/physicalsocketserver_unittest.cc
@@ -130,10 +130,16 @@ 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(); }