| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 #define MAYBE_TestUdpIPv6 DISABLED_TestUdpIPv6 | 204 #define MAYBE_TestUdpIPv6 DISABLED_TestUdpIPv6 |
| 205 #else | 205 #else |
| 206 #define MAYBE_TestUdpIPv6 TestUdpIPv6 | 206 #define MAYBE_TestUdpIPv6 TestUdpIPv6 |
| 207 #endif | 207 #endif |
| 208 TEST_F(PhysicalSocketTest, MAYBE_TestUdpIPv6) { | 208 TEST_F(PhysicalSocketTest, MAYBE_TestUdpIPv6) { |
| 209 SocketTest::TestUdpIPv6(); | 209 SocketTest::TestUdpIPv6(); |
| 210 } | 210 } |
| 211 | 211 |
| 212 // Disable for TSan v2, see | 212 // Disable for TSan v2, see |
| 213 // https://code.google.com/p/webrtc/issues/detail?id=3498 for details. | 213 // https://code.google.com/p/webrtc/issues/detail?id=3498 for details. |
| 214 #if !defined(THREAD_SANITIZER) | 214 // Also disable for MSan, see: |
| 215 // https://code.google.com/p/webrtc/issues/detail?id=4958 |
| 216 // TODO(deadbeef): Enable again once test is reimplemented to be unflaky. |
| 217 #if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) |
| 215 | 218 |
| 216 TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv4) { | 219 TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv4) { |
| 217 SocketTest::TestUdpReadyToSendIPv4(); | 220 SocketTest::TestUdpReadyToSendIPv4(); |
| 218 } | 221 } |
| 219 | 222 |
| 220 #endif // if !defined(THREAD_SANITIZER) | 223 #endif // if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) |
| 221 | 224 |
| 222 TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv6) { | 225 TEST_F(PhysicalSocketTest, TestUdpReadyToSendIPv6) { |
| 223 SocketTest::TestUdpReadyToSendIPv6(); | 226 SocketTest::TestUdpReadyToSendIPv6(); |
| 224 } | 227 } |
| 225 | 228 |
| 226 TEST_F(PhysicalSocketTest, TestGetSetOptionsIPv4) { | 229 TEST_F(PhysicalSocketTest, TestGetSetOptionsIPv4) { |
| 227 SocketTest::TestGetSetOptionsIPv4(); | 230 SocketTest::TestGetSetOptionsIPv4(); |
| 228 } | 231 } |
| 229 | 232 |
| 230 TEST_F(PhysicalSocketTest, TestGetSetOptionsIPv6) { | 233 TEST_F(PhysicalSocketTest, TestGetSetOptionsIPv6) { |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 thread->Start(runnable.get()); | 353 thread->Start(runnable.get()); |
| 351 EXPECT_TRUE(ss_->Wait(1500, true)); | 354 EXPECT_TRUE(ss_->Wait(1500, true)); |
| 352 EXPECT_TRUE(ExpectSignal(SIGTERM)); | 355 EXPECT_TRUE(ExpectSignal(SIGTERM)); |
| 353 EXPECT_EQ(Thread::Current(), signaled_thread_); | 356 EXPECT_EQ(Thread::Current(), signaled_thread_); |
| 354 EXPECT_TRUE(ExpectNone()); | 357 EXPECT_TRUE(ExpectNone()); |
| 355 } | 358 } |
| 356 | 359 |
| 357 #endif | 360 #endif |
| 358 | 361 |
| 359 } // namespace rtc | 362 } // namespace rtc |
| OLD | NEW |