From e5e92bd5565f2dfa0eafaa241e7c535bf7f92a95 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Sun, 22 Mar 2015 16:27:50 +0000 Subject: [PATCH] Disable WebRtcVideoMediaChannelTest.AddRemoveRecvStreamAndRender on Windows (fix) In https://webrtc-codereview.appspot.com/43899004/ I managed to get some kind of weird whitespace character in there that completely breaks Goma and local compilation. This fixes that. BUG=4452 TBR=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/43909004 Cr-Commit-Position: refs/heads/master@{#8821} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8821 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/talk/media/webrtc/webrtcvideoengine_unittest.cc b/talk/media/webrtc/webrtcvideoengine_unittest.cc index 088c250f7f..edfa53a793 100644 --- a/talk/media/webrtc/webrtcvideoengine_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine_unittest.cc @@ -2491,7 +2491,7 @@ TEST_F(WebRtcVideoMediaChannelTest, AddRemoveRecvStreams) { } // Flaky on Linux and Windows. See webrtc:4452. -#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX) +#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX) #define MAYBE_AddRemoveRecvStreamAndRender DISABLED_AddRemoveRecvStreamAndRender #else #define MAYBE_AddRemoveRecvStreamAndRender AddRemoveRecvStreamAndRender