diff options
| author | kjellander <kjellander@webrtc.org> | 2016-01-06 05:23:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-06 13:23:16 +0000 |
| commit | 335ecf59d0397e976f6e86b81c7aef0b1277484e (patch) | |
| tree | 37d4c64d990fd563fa106491ed8fbe79263a6223 /webrtc | |
| parent | b6802749f1c87e10b2442ecf3e75ba7b8ff45188 (diff) | |
| download | webrtc-335ecf59d0397e976f6e86b81c7aef0b1277484e.tar.gz | |
Disable VideoCaptureTest.Capabilities and CreateDelete fails on Mac
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}
Diffstat (limited to 'webrtc')
| -rw-r--r-- | webrtc/modules/video_capture/test/video_capture_unittest.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc index 7623131226..45d2d2f241 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -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; |