From cfebcca51bba77949b2c5a1fdddca5e17d8e993f Mon Sep 17 00:00:00 2001 From: "henrik.lundin" Date: Fri, 1 Apr 2016 03:23:14 -0700 Subject: [PATCH] Disable VideoCaptureExternalTest.FrameRate on Mac The test is flaky. BUG=webrtc:3270 TBR=mflodman@webrtc.org NOTRY=true Review URL: https://codereview.webrtc.org/1851023002 Cr-Commit-Position: refs/heads/master@{#12196} --- webrtc/modules/video_capture/test/video_capture_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc index 04f0a5ce09..7ab33ffeab 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -487,7 +487,7 @@ TEST_F(VideoCaptureExternalTest, TestExternalCapture) { // Test frame rate and no picture alarm. // Flaky on Win32, see webrtc:3270. -#if defined(WEBRTC_WIN) +#if defined(WEBRTC_WIN) || defined(WEBRTC_MAC) #define MAYBE_FrameRate DISABLED_FrameRate #else #define MAYBE_FrameRate FrameRate