zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable ViEExtendedIntegrationTest.RunsCodecTestWithoutErrors test.

Browse Source 
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
This commit is contained in:
kjellander@webrtc.org
2013-06-12 14:38:01 +00:00
parent 935d705370
commit 20a993f88a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc
View File

@ -32,12 +32,13 @@ TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest),
// Flaky on Windows: http://code.google.com/p/webrtc/issues/detail?id=1925 // Flaky on Windows: http://code.google.com/p/webrtc/issues/detail?id=1925
// (in addition to being disabled on Mac due to webrtc:1268). // (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 #define MAYBE_RunsCodecTestWithoutErrors DISABLED_RunsCodecTestWithoutErrors
#else #else
#define MAYBE_RunsCodecTestWithoutErrors RunsCodecTestWithoutErrors #define MAYBE_RunsCodecTestWithoutErrors RunsCodecTestWithoutErrors
#endif #endif
TEST_F(ViEExtendedIntegrationTest, MAYBE_RunsCodecTestWithoutErrors) { TEST_F(DISABLED_ON_MAC(ViEExtendedIntegrationTest),
MAYBE_RunsCodecTestWithoutErrors) {
tests_->ViECodecExtendedTest(); tests_->ViECodecExtendedTest();
} }