generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable WebRtcVideoMediaChannelSimulcastTest.SimulcastSend tests on Win (take 2)

Browse Source 
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
This commit is contained in:
kjellander@webrtc.org 2015-01-07 10:36:53 +00:00
parent 4e5115ae73
commit 07c83a1385
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
talk/media/webrtc/webrtcvideoengine_unittest.cc
View File

@ -4246,7 +4246,7 @@ TEST_F(WebRtcVideoEngineSimulcastTestFake,
} }
// Flaky on Windows. https://code.google.com/p/webrtc/issues/detail?id=4135 // 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 #define MAYBE_SimulcastSend_1280x800 DISABLED_SimulcastSend_1280x800
#else #else
#define MAYBE_SimulcastSend_1280x800 SimulcastSend_1280x800 #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 // 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 #define MAYBE_SimulcastSend_1280x720 DISABLED_SimulcastSend_1280x720
#else #else
#define MAYBE_SimulcastSend_1280x720 SimulcastSend_1280x720 #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 // 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 #define MAYBE_SimulcastSend_960x540 DISABLED_SimulcastSend_960x540
#else #else
#define MAYBE_SimulcastSend_960x540 SimulcastSend_960x540 #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 // 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 #define MAYBE_SimulcastSend_960x600 DISABLED_SimulcastSend_960x600
#else #else
#define MAYBE_SimulcastSend_960x600 SimulcastSend_960x600 #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 // 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 #define MAYBE_SimulcastSend_640x400 DISABLED_SimulcastSend_640x400
#else #else
#define MAYBE_SimulcastSend_640x400 SimulcastSend_640x400 #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 // 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 #define MAYBE_SimulcastSend_640x360 DISABLED_SimulcastSend_640x360
#else #else
#define MAYBE_SimulcastSend_640x360 SimulcastSend_640x360 #define MAYBE_SimulcastSend_640x360 SimulcastSend_640x360