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
This commit is contained in:
parent
935d705370
commit
20a993f88a
@ -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();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user