zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change MANUAL -> DISABLED for ScreenCapturerIntegrationTest tests

Browse Source 
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}
This commit is contained in:
Henrik Kjellander
2016-12-12 08:29:55 +01:00
parent 9e3e0da9de
commit 99f7bfde28
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/desktop_capture/screen_capturer_integration_test.cc
View File

@ -287,7 +287,7 @@ class ScreenCapturerIntegrationTest : public testing::Test {
#if defined(WEBRTC_WIN) #if defined(WEBRTC_WIN)
// ScreenCapturerWinGdi randomly returns blank screen, the root cause is still // ScreenCapturerWinGdi randomly returns blank screen, the root cause is still
// unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843. // unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843.
#define MAYBE_CaptureUpdatedRegion MANUAL_CaptureUpdatedRegion #define MAYBE_CaptureUpdatedRegion DISABLED_CaptureUpdatedRegion
#else #else
#define MAYBE_CaptureUpdatedRegion CaptureUpdatedRegion #define MAYBE_CaptureUpdatedRegion CaptureUpdatedRegion
#endif #endif
@ -298,7 +298,7 @@ TEST_F(ScreenCapturerIntegrationTest, MAYBE_CaptureUpdatedRegion) {
#if defined(WEBRTC_WIN) #if defined(WEBRTC_WIN)
// ScreenCapturerWinGdi randomly returns blank screen, the root cause is still // ScreenCapturerWinGdi randomly returns blank screen, the root cause is still
// unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843. // unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843.
#define MAYBE_TwoCapturers MANUAL_TwoCapturers #define MAYBE_TwoCapturers DISABLED_TwoCapturers
#else #else
#define MAYBE_TwoCapturers TwoCapturers #define MAYBE_TwoCapturers TwoCapturers
#endif #endif