From cfde27eeb3244518e2d3c3a2a5f0f85ddd32e3a3 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Sun, 22 Mar 2015 16:09:15 +0000 Subject: [PATCH] Disable WebRtcVideoMediaChannelTest.AddRemoveRecvStreamAndRender on Windows. The test is flaky: http://build.chromium.org/p/client.webrtc/builders/Win64%20Release/builds/4179 BUG=4452 TBR=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/43899004 Cr-Commit-Position: refs/heads/master@{#8820} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8820 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine_unittest.cc b/talk/media/webrtc/webrtcvideoengine_unittest.cc index 31eb1d867d..088c250f7f 100644 --- a/talk/media/webrtc/webrtcvideoengine_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine_unittest.cc @@ -2490,8 +2490,8 @@ TEST_F(WebRtcVideoMediaChannelTest, AddRemoveRecvStreams) { Base::AddRemoveRecvStreams(); } -// Flaky on Linux only. See webrtc:4452. -#if defined(WEBRTC_LINUX) +// Flaky on Linux and Windows. See webrtc:4452. +#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX) #define MAYBE_AddRemoveRecvStreamAndRender DISABLED_AddRemoveRecvStreamAndRender #else #define MAYBE_AddRemoveRecvStreamAndRender AddRemoveRecvStreamAndRender