| Index: webrtc/video/full_stack_tests.cc
|
| diff --git a/webrtc/video/full_stack_tests.cc b/webrtc/video/full_stack_tests.cc
|
| index b7125d39c9074278fe05d56b2d34cf2391bdcee3..bda26efab25528cc96484114bf39b4cd90dd4137 100644
|
| --- a/webrtc/video/full_stack_tests.cc
|
| +++ b/webrtc/video/full_stack_tests.cc
|
| @@ -507,7 +507,15 @@ TEST_F(FullStackTest, LargeRoomVP8_5thumb) {
|
| RunTest(large_room);
|
| }
|
|
|
| -TEST_F(FullStackTest, LargeRoomVP8_15thumb) {
|
| +#if defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN)
|
| +// Fails on Android and win:
|
| +// https://bugs.chromium.org/p/webrtc/issues/detail?id=7301
|
| +#define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb
|
| +#else
|
| +#define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb
|
| +#endif
|
| +
|
| +TEST_F(FullStackTest, MAYBE_LargeRoomVP8_15thumb) {
|
| VideoQualityTest::Params large_room;
|
| large_room.call.send_side_bwe = true;
|
| large_room.video = kSimulcastVp8VideoHigh;
|
| @@ -530,14 +538,6 @@ TEST_F(FullStackTest, LargeRoomVP8_15thumb) {
|
| RunTest(large_room);
|
| }
|
|
|
| -#if defined(WEBRTC_ANDROID) || defined(WEBRTC_WIN)
|
| -// Fails on Android and win:
|
| -// https://bugs.chromium.org/p/webrtc/issues/detail?id=7301
|
| -#define MAYBE_LargeRoomVP8_50thumb DISABLED_LargeRoomVP8_50thumb
|
| -#else
|
| -#define MAYBE_LargeRoomVP8_50thumb LargeRoomVP8_50thumb
|
| -#endif
|
| -
|
| TEST_F(FullStackTest, MAYBE_LargeRoomVP8_50thumb) {
|
| VideoQualityTest::Params large_room;
|
| large_room.call.send_side_bwe = true;
|
|
|