MANUAL tests of GDI capturers

webrtc/modules/desktop_capture/screen_capturer_integration_test.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 266 matching lines @@
       } else {
         EXPECT_FALSE(frame);
       }
     }
 
     EXPECT_TRUE(false);
     return nullptr;
   }
 };
 
-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.
+#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

[Sergey Ulanov, 2016/12/09 23:18:01]

s/DISABLE_/MANUAL_/

[Hzj_jie, 2016/12/09 23:33:19]

There is a mail thread between Henrik and me, we will use the MANUAL_ prefix to
execute these tests in waterfall without impacting other developers.

[kjellander_webrtc, 2016/12/12 07:30:31]

It turns out I misunderstood that MANUAL_ was a part of the supported gtest
prefixes. It's something that Chromium implemented only for their test launcher:
https://cs.chromium.org/chromium/src/content/public/test/test_launcher.cc?rcl...

Luckily, we can use DISABLED_ for the same purpose, since there's the
--gtest_also_run_disabled_tests flag. I submitted
https://codereview.webrtc.org/2568013002 to change this.

+#else
+#define MAYBE_CaptureUpdatedRegion CaptureUpdatedRegion
+#endif
+TEST_F(ScreenCapturerIntegrationTest, MAYBE_CaptureUpdatedRegion) {
   TestCaptureUpdatedRegion();
-#endif
 }
 
-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<DesktopCapturer> capturer2 = std::move(capturer_);
   SetUp();
   TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
-#endif
 }
 
 #if defined(WEBRTC_WIN)
 
 TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegionWithDirectxCapturer) {
   if (!CreateDirectxCapturer()) {
     return;
   }
 
   TestCaptureUpdatedRegion();
@@ skipping 50 matching lines @@
   }
   // Even DirectX capturer is not supported in current system, we should be able
   // to select a usable capturer.
   MaybeCreateDirectxCapturer();
   TestCaptureUpdatedRegion();
 }
 
 #endif  // defined(WEBRTC_WIN)
 
 }  // namespace webrtc