From 7790e8779d8965107d625e1fc894e21fece150dd Mon Sep 17 00:00:00 2001 From: kjellander Date: Sun, 25 Jun 2017 13:50:03 -0700 Subject: [PATCH] Disable FullStackTest.SimulcastFullHdOveruse on Mac This test was added in "Add cropping to VIEEncoder to match simulcast streams resolution (https://codereview.webrtc.org/2936393002) and makes webrtc_perf_tests fail+timeout on Mac: https://build.chromium.org/p/client.webrtc.perf/builders/Mac%2010.11/builds/2896 [ RUN ] FullStackTest.SimulcastFullHdOveruse - Uh, I'm-I'm not quite dead, sir. - Uh, I-I think uh, I could pull through, sir. ../../webrtc/video/video_quality_test.cc:419: Failure Expected: (frames_processed) > (last_frames_processed), actual: 591 vs 591 Analyzer stalled while waiting for test to finish. TBR=sprang@webrtc.org,magjed@webrtc.org,ilnik@webrtc.org BUG=webrtc:7375, webrtc:6958 NOTRY=True Review-Url: https://codereview.webrtc.org/2960573002 Cr-Commit-Position: refs/heads/master@{#18748} --- webrtc/video/full_stack_tests.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webrtc/video/full_stack_tests.cc b/webrtc/video/full_stack_tests.cc index 8299771379..3e5781688e 100644 --- a/webrtc/video/full_stack_tests.cc +++ b/webrtc/video/full_stack_tests.cc @@ -465,7 +465,8 @@ TEST_F(FullStackTest, VP9SVC_3SL_Low) { #endif // !defined(RTC_DISABLE_VP9) // Android bots can't handle FullHD, so disable the test. -#if defined(WEBRTC_ANDROID) +// Test is not working correctly on Mac: webrtc:7870. +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_MAC) #define MAYBE_SimulcastFullHdOveruse DISABLED_SimulcastFullHdOveruse #else #define MAYBE_SimulcastFullHdOveruse SimulcastFullHdOveruse