webrtc/modules/video_capture/test/video_capture_unittest.cc - Issue 1851023002: Disable VideoCaptureExternalTest.FrameRate on Mac

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/video_capture/test/video_capture_unittest.cc

Issue 1851023002: Disable VideoCaptureExternalTest.FrameRate on Mac (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 9 months 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 side-by-side diff with in-line comments

Download patch

Index: webrtc/modules/video_capture/test/video_capture_unittest.cc

diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc

index 04f0a5ce099141a432d165afe025351426d755c8..7ab33ffeaba4f7b49af923652183a488a6b9bae8 100644

--- a/webrtc/modules/video_capture/test/video_capture_unittest.cc

+++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc

@@ -487,7 +487,7 @@ TEST_F(VideoCaptureExternalTest, TestExternalCapture) {

// Test frame rate and no picture alarm.

// Flaky on Win32, see webrtc:3270.

-#if defined(WEBRTC_WIN)

+#if defined(WEBRTC_WIN) || defined(WEBRTC_MAC)

#define MAYBE_FrameRate DISABLED_FrameRate

#else

#define MAYBE_FrameRate FrameRate

« no previous file with comments | « no previous file | no next file » | no next file with comments »