Chromium Code Reviews| Index: webrtc/call/bitrate_estimator_tests.cc |
| diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc |
| index c63d45dc6e695c26c801b206399c95584f95ed2a..f409d108f843cef4f65fa3740915a94d8c0df1b1 100644 |
| --- a/webrtc/call/bitrate_estimator_tests.cc |
| +++ b/webrtc/call/bitrate_estimator_tests.cc |
| @@ -302,7 +302,15 @@ TEST_F(BitrateEstimatorTest, SwitchesToASTForVideo) { |
| EXPECT_TRUE(receiver_log_.Wait()); |
| } |
| -TEST_F(BitrateEstimatorTest, SwitchesToASTThenBackToTOFForVideo) { |
| +// Crashes when run with ASan. See webrtc:5790. |
|
pbos-webrtc
2016/04/15 08:19:58
Not true, it fails, not crashes
|
| +#if defined(ADDRESS_SANITIZER) && defined(WEBRTC_LINUX) |
|
pbos-webrtc
2016/04/15 08:19:59
I don't think you need WEBRTC_LINUX here, we can d
|
| +#define MAYBE_SwitchesToASTThenBackToTOFForVideo \ |
| + DISABLED_SwitchesToASTThenBackToTOFForVideo |
| +#else |
| +#define MAYBE_SwitchesToASTThenBackToTOFForVideo \ |
| + SwitchesToASTThenBackToTOFForVideo |
| +#endif |
| +TEST_F(BitrateEstimatorTest, MAYBE_SwitchesToASTThenBackToTOFForVideo) { |
| video_send_config_.rtp.extensions.push_back( |
| RtpExtension(RtpExtension::kTOffset, kTOFExtensionId)); |
| receiver_log_.PushExpectedLogLine(kSingleStreamLog); |