| Index: webrtc/base/physicalsocketserver_unittest.cc
|
| diff --git a/webrtc/base/physicalsocketserver_unittest.cc b/webrtc/base/physicalsocketserver_unittest.cc
|
| index 568f88c49efd80e8c7b0b2ca724fc74a400ae348..6c7be9f63c624c04e9734fd9f8410fbf8c473932 100644
|
| --- a/webrtc/base/physicalsocketserver_unittest.cc
|
| +++ b/webrtc/base/physicalsocketserver_unittest.cc
|
| @@ -214,14 +214,17 @@ TEST_F(PhysicalSocketTest, MAYBE_TestUdpIPv6) {
|
| // Also disable for MSan, see:
|
| // https://code.google.com/p/webrtc/issues/detail?id=4958
|
| // TODO(deadbeef): Enable again once test is reimplemented to be unflaky.
|
| -#if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER)
|
| -
|
| -TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv4) {
|
| +// Also disable for ASan.
|
| +#if defined(THREAD_SANITIZER) || defined(MEMORY_SANITIZER) || \
|
| + defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_TestUdpReadyToSendIPv4 DISABLED_TestUdpReadyToSendIPv4
|
| +#else
|
| +#define MAYBE_TestUdpReadyToSendIPv4 TestUdpReadyToSendIPv4
|
| +#endif
|
| +TEST_F(PhysicalSocketTest, MAYBE_TestUdpReadyToSendIPv4) {
|
| SocketTest::TestUdpReadyToSendIPv4();
|
| }
|
|
|
| -#endif // if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER)
|
| -
|
| TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv6) {
|
| SocketTest::TestUdpReadyToSendIPv6();
|
| }
|
|
|