From 8d1649d71b74d511c508b0b3d41faf8c1a075c70 Mon Sep 17 00:00:00 2001 From: zijiehe Date: Fri, 9 Dec 2016 16:00:00 -0800 Subject: [PATCH] MANUAL tests of GDI capturers ScreenCapturerWinGdi randomly returns black frames in test environment. The root cause is still unknown, so change ScreenCapturerWinGdi tests into MANUAL mode to execute in test environment, but unblock other developers. We can eventually get a failure ratio and more samples for debugging. BUG=webrtc:6666, webrtc:6843 Review-Url: https://codereview.webrtc.org/2564173002 Cr-Commit-Position: refs/heads/master@{#15518} --- .../screen_capturer_integration_test.cc | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc index 30002e9925..b6821c2c42 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc @@ -284,22 +284,28 @@ class ScreenCapturerIntegrationTest : public testing::Test { } }; -TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegion) { -#if !defined(WEBRTC_WIN) - // ScreenCapturerWinGdi randomly returns blank screen, the root cause is still - // unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843. - TestCaptureUpdatedRegion(); +#if defined(WEBRTC_WIN) +// ScreenCapturerWinGdi randomly returns blank screen, the root cause is still +// unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843. +#define MAYBE_CaptureUpdatedRegion MANUAL_CaptureUpdatedRegion +#else +#define MAYBE_CaptureUpdatedRegion CaptureUpdatedRegion #endif +TEST_F(ScreenCapturerIntegrationTest, MAYBE_CaptureUpdatedRegion) { + TestCaptureUpdatedRegion(); } -TEST_F(ScreenCapturerIntegrationTest, TwoCapturers) { -#if !defined(WEBRTC_WIN) - // ScreenCapturerWinGdi randomly returns blank screen, the root cause is still - // unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843. +#if defined(WEBRTC_WIN) +// ScreenCapturerWinGdi randomly returns blank screen, the root cause is still +// unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843. +#define MAYBE_TwoCapturers MANUAL_TwoCapturers +#else +#define MAYBE_TwoCapturers TwoCapturers +#endif +TEST_F(ScreenCapturerIntegrationTest, MAYBE_TwoCapturers) { std::unique_ptr capturer2 = std::move(capturer_); SetUp(); TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); -#endif } #if defined(WEBRTC_WIN)