From 07c83a13857c11e324a8966914c2ca30be365114 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 7 Jan 2015 10:36:53 +0000 Subject: [PATCH] Disable WebRtcVideoMediaChannelSimulcastTest.SimulcastSend tests on Win (take 2) In https://webrtc-codereview.appspot.com/35669004/ the wrong define was used (OS_WIN only exists in Chromium code). BUG=4135 R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/33799004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@8008 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine_unittest.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/talk/media/webrtc/webrtcvideoengine_unittest.cc b/talk/media/webrtc/webrtcvideoengine_unittest.cc index 92885ac5d0..324d76103c 100644 --- a/talk/media/webrtc/webrtcvideoengine_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine_unittest.cc @@ -4246,7 +4246,7 @@ TEST_F(WebRtcVideoEngineSimulcastTestFake, } // Flaky on Windows. https://code.google.com/p/webrtc/issues/detail?id=4135 -#if defined(OS_WIN) +#if defined(WIN32) #define MAYBE_SimulcastSend_1280x800 DISABLED_SimulcastSend_1280x800 #else #define MAYBE_SimulcastSend_1280x800 SimulcastSend_1280x800 @@ -4260,7 +4260,7 @@ TEST_F(WebRtcVideoMediaChannelSimulcastTest, MAYBE_SimulcastSend_1280x800) { } // Flaky on Windows. https://code.google.com/p/webrtc/issues/detail?id=4135 -#if defined(OS_WIN) +#if defined(WIN32) #define MAYBE_SimulcastSend_1280x720 DISABLED_SimulcastSend_1280x720 #else #define MAYBE_SimulcastSend_1280x720 SimulcastSend_1280x720 @@ -4274,7 +4274,7 @@ TEST_F(WebRtcVideoMediaChannelSimulcastTest, MAYBE_SimulcastSend_1280x720) { } // Flaky on Windows. https://code.google.com/p/webrtc/issues/detail?id=4135 -#if defined(OS_WIN) +#if defined(WIN32) #define MAYBE_SimulcastSend_960x540 DISABLED_SimulcastSend_960x540 #else #define MAYBE_SimulcastSend_960x540 SimulcastSend_960x540 @@ -4288,7 +4288,7 @@ TEST_F(WebRtcVideoMediaChannelSimulcastTest, MAYBE_SimulcastSend_960x540) { } // Flaky on Windows. https://code.google.com/p/webrtc/issues/detail?id=4135 -#if defined(OS_WIN) +#if defined(WIN32) #define MAYBE_SimulcastSend_960x600 DISABLED_SimulcastSend_960x600 #else #define MAYBE_SimulcastSend_960x600 SimulcastSend_960x600 @@ -4302,7 +4302,7 @@ TEST_F(WebRtcVideoMediaChannelSimulcastTest, MAYBE_SimulcastSend_960x600) { } // Flaky on Windows. https://code.google.com/p/webrtc/issues/detail?id=4135 -#if defined(OS_WIN) +#if defined(WIN32) #define MAYBE_SimulcastSend_640x400 DISABLED_SimulcastSend_640x400 #else #define MAYBE_SimulcastSend_640x400 SimulcastSend_640x400 @@ -4315,7 +4315,7 @@ TEST_F(WebRtcVideoMediaChannelSimulcastTest, MAYBE_SimulcastSend_640x400) { } // Flaky on Windows. https://code.google.com/p/webrtc/issues/detail?id=4135 -#if defined(OS_WIN) +#if defined(WIN32) #define MAYBE_SimulcastSend_640x360 DISABLED_SimulcastSend_640x360 #else #define MAYBE_SimulcastSend_640x360 SimulcastSend_640x360