From b32c473770a0cc116341b889ff6fe58aef1c4530 Mon Sep 17 00:00:00 2001 From: philipel Date: Tue, 5 Dec 2017 09:25:09 +0100 Subject: [PATCH] Again disable EndToEndTest.InitialProbing on certain bots. After changing from TEST_F to TEST_P the MAYBE_InitialProbing macro was not expanded as expected, causing the test to be enabled on all bots with the name MAYBE_InitialProbing. Bug: None Change-Id: Icfb0c4b381510c1b73295f017ebb68d43b7d9809 Reviewed-on: https://webrtc-review.googlesource.com/29640 Reviewed-by: Stefan Holmer Commit-Queue: Philip Eliasson Cr-Commit-Position: refs/heads/master@{#21074} --- video/end_to_end_tests.cc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/video/end_to_end_tests.cc b/video/end_to_end_tests.cc index 5b5be324bb..2313a39bb4 100644 --- a/video/end_to_end_tests.cc +++ b/video/end_to_end_tests.cc @@ -62,16 +62,6 @@ #include "test/testsupport/perf_test.h" #include "video/transport_adapter.h" -// Flaky under MemorySanitizer: bugs.webrtc.org/7419 -#if defined(MEMORY_SANITIZER) -#define MAYBE_InitialProbing DISABLED_InitialProbing -// Fails on iOS bots: bugs.webrtc.org/7851 -#elif defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR -#define MAYBE_InitialProbing DISABLED_InitialProbing -#else -#define MAYBE_InitialProbing InitialProbing -#endif - namespace webrtc { namespace { @@ -2473,7 +2463,15 @@ class ProbingTest : public test::EndToEndTest { Call* sender_call_; }; -TEST_P(EndToEndTest, MAYBE_InitialProbing) { +// Flaky under MemorySanitizer: bugs.webrtc.org/7419 +// Flaky on iOS bots: bugs.webrtc.org/7851 +#if defined(MEMORY_SANITIZER) +TEST_P(EndToEndTest, DISABLED_InitialProbing) { +#elif defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR +TEST_P(EndToEndTest, DISABLED_InitialProbing) { +#else +TEST_P(EndToEndTest, InitialProbing) { +#endif class InitialProbingTest : public ProbingTest { public: explicit InitialProbingTest(bool* success)