Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Side by Side Diff: webrtc/modules/desktop_capture/screen_capturer_integration_test.cc

Issue 2568013002: Change MANUAL -> DISABLED for ScreenCapturerIntegrationTest tests (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 } 280 }
281 281
282 EXPECT_TRUE(false); 282 EXPECT_TRUE(false);
283 return nullptr; 283 return nullptr;
284 } 284 }
285 }; 285 };
286 286
287 #if defined(WEBRTC_WIN) 287 #if defined(WEBRTC_WIN)
288 // ScreenCapturerWinGdi randomly returns blank screen, the root cause is still 288 // ScreenCapturerWinGdi randomly returns blank screen, the root cause is still
289 // unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843. 289 // unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843.
290 #define MAYBE_CaptureUpdatedRegion MANUAL_CaptureUpdatedRegion 290 #define MAYBE_CaptureUpdatedRegion DISABLED_CaptureUpdatedRegion
291 #else 291 #else
292 #define MAYBE_CaptureUpdatedRegion CaptureUpdatedRegion 292 #define MAYBE_CaptureUpdatedRegion CaptureUpdatedRegion
293 #endif 293 #endif
294 TEST_F(ScreenCapturerIntegrationTest, MAYBE_CaptureUpdatedRegion) { 294 TEST_F(ScreenCapturerIntegrationTest, MAYBE_CaptureUpdatedRegion) {
295 TestCaptureUpdatedRegion(); 295 TestCaptureUpdatedRegion();
296 } 296 }
297 297
298 #if defined(WEBRTC_WIN) 298 #if defined(WEBRTC_WIN)
299 // ScreenCapturerWinGdi randomly returns blank screen, the root cause is still 299 // ScreenCapturerWinGdi randomly returns blank screen, the root cause is still
300 // unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843. 300 // unknown. Bug, https://bugs.chromium.org/p/webrtc/issues/detail?id=6843.
301 #define MAYBE_TwoCapturers MANUAL_TwoCapturers 301 #define MAYBE_TwoCapturers DISABLED_TwoCapturers
302 #else 302 #else
303 #define MAYBE_TwoCapturers TwoCapturers 303 #define MAYBE_TwoCapturers TwoCapturers
304 #endif 304 #endif
305 TEST_F(ScreenCapturerIntegrationTest, MAYBE_TwoCapturers) { 305 TEST_F(ScreenCapturerIntegrationTest, MAYBE_TwoCapturers) {
306 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); 306 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_);
307 SetUp(); 307 SetUp();
308 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); 308 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
309 } 309 }
310 310
311 #if defined(WEBRTC_WIN) 311 #if defined(WEBRTC_WIN)
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 } 369 }
370 // Even DirectX capturer is not supported in current system, we should be able 370 // Even DirectX capturer is not supported in current system, we should be able
371 // to select a usable capturer. 371 // to select a usable capturer.
372 MaybeCreateDirectxCapturer(); 372 MaybeCreateDirectxCapturer();
373 TestCaptureUpdatedRegion(); 373 TestCaptureUpdatedRegion();
374 } 374 }
375 375
376 #endif // defined(WEBRTC_WIN) 376 #endif // defined(WEBRTC_WIN)
377 377
378 } // namespace webrtc 378 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698