From 935d705370350a96d0e54fb8eba64c584c64312c Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 12 Jun 2013 13:59:57 +0000 Subject: [PATCH] Disable ViEExtendedIntegrationTest.RunsCodecTestWithoutErrors test. Disable on Windows due to failures on bots. BUG=1925 TEST=compile on Linux and Windows. R=mflodman TBR=mflodman Review URL: https://webrtc-codereview.appspot.com/1657004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4220 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../automated/vie_extended_integration_test.cc | 10 ++++++++-- 1 file changed, 8 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 a1e9fa7104..818551d47b 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 @@ -30,8 +30,14 @@ TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest), tests_->ViECaptureExtendedTest(); } -TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest), - RunsCodecTestWithoutErrors) { +// 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) +#define MAYBE_RunsCodecTestWithoutErrors DISABLED_RunsCodecTestWithoutErrors +#else +#define MAYBE_RunsCodecTestWithoutErrors RunsCodecTestWithoutErrors +#endif +TEST_F(ViEExtendedIntegrationTest, MAYBE_RunsCodecTestWithoutErrors) { tests_->ViECodecExtendedTest(); }