From 7124dd8561239072549a28690ef1bbab2fd5cfbc Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Date: Wed, 12 Jun 2013 08:28:09 +0000 Subject: [PATCH] Disable ViEStandardIntegrationTest.RunsRtpRtcpTestWithoutErrors test. BUG=1790 TEST=Just local compilation. R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1654004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4217 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../auto_test/automated/vie_standard_integration_test.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc index 1bcc7c532..e0018f7fe 100644 --- a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc +++ b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc @@ -59,7 +59,13 @@ TEST_F(ViEStandardIntegrationTest, RunsRenderTestWithoutErrors) { tests_->ViERenderStandardTest(); } -TEST_F(ViEStandardIntegrationTest, RunsRtpRtcpTestWithoutErrors) { +// Fails on Mac, see https://code.google.com/p/webrtc/issues/detail?id=1790 +#if defined(WEBRTC_MAC) +#define MAYBE_RunsRtpRtcpTestWithoutErrors DISABLED_RunsRtpRtcpTestWithoutErrors +#else +#define MAYBE_RunsRtpRtcpTestWithoutErrors RunsRtpRtcpTestWithoutErrors +#endif +TEST_F(ViEStandardIntegrationTest, MAYBE_RunsRtpRtcpTestWithoutErrors) { tests_->ViERtpRtcpStandardTest(); }