From 20a993f88acb73c3306a68a8060639ab8abb3962 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 12 Jun 2013 14:38:01 +0000 Subject: [PATCH] Disable ViEExtendedIntegrationTest.RunsCodecTestWithoutErrors test. Take two of http://review.webrtc.org/1657004/ This time with execution on trybots. BUG=1925 TEST=win,win_rel,mac,mac_rel,linux,linux_rel trybots passing. R=mflodman TBR=mflodman Review URL: https://webrtc-codereview.appspot.com/1658004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4221 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../auto_test/automated/vie_extended_integration_test.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc index 818551d47b..5e9215e844 100644 --- a/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc +++ b/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc @@ -32,12 +32,13 @@ TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest), // Flaky on Windows: http://code.google.com/p/webrtc/issues/detail?id=1925 // (in addition to being disabled on Mac due to webrtc:1268). -#if defined(WEBRTC_MAC) || defined(_WIN32) +#if defined(_WIN32) #define MAYBE_RunsCodecTestWithoutErrors DISABLED_RunsCodecTestWithoutErrors #else #define MAYBE_RunsCodecTestWithoutErrors RunsCodecTestWithoutErrors #endif -TEST_F(ViEExtendedIntegrationTest, MAYBE_RunsCodecTestWithoutErrors) { +TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest), + MAYBE_RunsCodecTestWithoutErrors) { tests_->ViECodecExtendedTest(); }