| Index: webrtc/video/end_to_end_tests.cc
|
| diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
|
| index baf7161252935d5bf964c8c6e5453eb1a12993ce..6f030c3b58ff6cc136f6b3ed10c9398a73ac155d 100644
|
| --- a/webrtc/video/end_to_end_tests.cc
|
| +++ b/webrtc/video/end_to_end_tests.cc
|
| @@ -56,6 +56,14 @@
|
| #include "webrtc/video/transport_adapter.h"
|
| #include "webrtc/video_encoder.h"
|
|
|
| +#if defined(MEMORY_SANITIZER)
|
| +// Flaky under MemorySanitizer, see
|
| +// https://bugs.chromium.org/p/webrtc/issues/detail?id=7419
|
| +#define MAYBE_InitialProbing DISABLED_InitialProbing
|
| +#else
|
| +#define MAYBE_InitialProbing InitialProbing
|
| +#endif
|
| +
|
| namespace webrtc {
|
|
|
| static const int kSilenceTimeoutMs = 2000;
|
| @@ -2225,7 +2233,7 @@ class ProbingTest : public test::EndToEndTest {
|
| Call* sender_call_;
|
| };
|
|
|
| -TEST_F(EndToEndTest, InitialProbing) {
|
| +TEST_F(EndToEndTest, MAYBE_InitialProbing) {
|
| class InitialProbingTest : public ProbingTest {
|
| public:
|
| InitialProbingTest() : ProbingTest(300000) {}
|
|
|