From 8dfe8ff590fc473dbc2a60509a5953534a9a9136 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Mon, 28 Apr 2014 11:27:36 +0000 Subject: [PATCH] Disable capture test for FrameRate on Windows. Flaky on Windows, has been for a while. R=kjellander@webrtc.org TBR=mflodman@webrtc.org BUG=3270 Review URL: https://webrtc-codereview.appspot.com/19389004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5994 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/video_capture/test/video_capture_unittest.cc | 4 +++- 1 file changed, 3 insertions(+), 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 bf3be83987..4c2263d04f 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -25,6 +25,7 @@ #include "webrtc/system_wrappers/interface/scoped_refptr.h" #include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/tick_util.h" +#include "webrtc/test/testsupport/gtest_disable.h" using webrtc::CriticalSectionWrapper; using webrtc::CriticalSectionScoped; @@ -550,7 +551,8 @@ TEST_F(VideoCaptureExternalTest, DISABLED_TestExternalCaptureI420) { } // Test frame rate and no picture alarm. -TEST_F(VideoCaptureExternalTest , FrameRate) { +// Flaky on Win32, see webrtc:3270. +TEST_F(VideoCaptureExternalTest, DISABLED_ON_WIN(FrameRate)) { int64_t testTime = 3; TickTime startTime = TickTime::Now();