From 99f7bfde283b8ae20971b9bd804c6210f7c156eb Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Mon, 12 Dec 2016 08:29:55 +0100 Subject: [PATCH] Change MANUAL -> DISABLED for ScreenCapturerIntegrationTest tests It turns out MANUAL_ isn't a part of the supported gtest prefixes: it's a part of the Chromium test launcher: https://cs.chromium.org/chromium/src/content/public/test/test_launcher.cc?rcl=0&l=69 Luckily, we can use DISABLED_ for the same purpose, since there's the --gtest_also_run_disabled_tests flag we can use. BUG=webrtc:6666, webrtc:6843 TBR=zijiehe@chromium.org Review-Url: https://codereview.webrtc.org/2568013002 . Cr-Commit-Position: refs/heads/master@{#15539} --- .../desktop_capture/screen_capturer_integration_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc index b6821c2c42..28d780e688 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc @@ -287,7 +287,7 @@ class ScreenCapturerIntegrationTest : public testing::Test { #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 +#define MAYBE_CaptureUpdatedRegion DISABLED_CaptureUpdatedRegion #else #define MAYBE_CaptureUpdatedRegion CaptureUpdatedRegion #endif @@ -298,7 +298,7 @@ TEST_F(ScreenCapturerIntegrationTest, MAYBE_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. -#define MAYBE_TwoCapturers MANUAL_TwoCapturers +#define MAYBE_TwoCapturers DISABLED_TwoCapturers #else #define MAYBE_TwoCapturers TwoCapturers #endif