admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable VideoCaptureTest.Capabilities and CreateDelete fails on Mac

Browse Source 
These tests started failing on the bots after switching the build
from 32 to 64-bit.

NOTRY=True
BUG=webrtc:5406
TBR=perkj@webrtc.org

Review URL: https://codereview.webrtc.org/1566683002

Cr-Commit-Position: refs/heads/master@{#11154}
This commit is contained in:
kjellander 2016-01-06 05:23:09 -08:00 committed by Commit bot
parent b6802749f1
commit 335ecf59d0
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/modules/video_capture/test/video_capture_unittest.cc
View File

@ -274,7 +274,14 @@ class VideoCaptureTest : public testing::Test {
unsigned int number_of_devices_;
};
TEST_F(VideoCaptureTest, CreateDelete) {
#ifdef WEBRTC_MAC
// Currently fails on Mac 64-bit, see
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406
#define MAYBE_CreateDelete DISABLED_CreateDelete
#else
#define MAYBE_CreateDelete CreateDelete
#endif
TEST_F(VideoCaptureTest, MAYBE_CreateDelete) {
for (int i = 0; i < 5; ++i) {
int64_t start_time = TickTime::MillisecondTimestamp();
TestVideoCaptureCallback capture_observer;
@ -311,7 +318,14 @@ TEST_F(VideoCaptureTest, CreateDelete) {
}
}
TEST_F(VideoCaptureTest, Capabilities) {
#ifdef WEBRTC_MAC
// Currently fails on Mac 64-bit, see
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406
#define MAYBE_Capabilities DISABLED_Capabilities
#else
#define MAYBE_Capabilities Capabilities
#endif
TEST_F(VideoCaptureTest, MAYBE_Capabilities) {
#ifdef WEBRTC_MAC
printf("Video capture capabilities are not supported on Mac.\n");
return;