diff --git a/modules/video_capture/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc index c8af222b57..f1142302a1 100644 --- a/modules/video_capture/test/video_capture_unittest.cc +++ b/modules/video_capture/test/video_capture_unittest.cc @@ -191,9 +191,10 @@ class VideoCaptureTest : public ::testing::Test { unsigned int number_of_devices_; }; -#ifdef WEBRTC_MAC -// Currently fails on Mac 64-bit, see -// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406 +#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) +// Currently fails on Mac 64-bit and Linux rel, see +// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406 and +// https://bugs.chromium.org/p/webrtc/issues/detail?id=15229 #define MAYBE_CreateDelete DISABLED_CreateDelete #else #define MAYBE_CreateDelete CreateDelete @@ -233,9 +234,10 @@ TEST_F(VideoCaptureTest, MAYBE_CreateDelete) { } } -#ifdef WEBRTC_MAC -// Currently fails on Mac 64-bit, see -// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406 +#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) +// Currently fails on Mac 64-bit and Linux rel, see +// https://bugs.chromium.org/p/webrtc/issues/detail?id=5406 and +// https://bugs.chromium.org/p/webrtc/issues/detail?id=15229 #define MAYBE_Capabilities DISABLED_Capabilities #else #define MAYBE_Capabilities Capabilities @@ -342,8 +344,10 @@ TEST_F(VideoCaptureTest, DISABLED_TestTwoCameras) { EXPECT_EQ(0, module1->StopCapture()); } -#ifdef WEBRTC_MAC +#if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX) // No VideoCaptureImpl on Mac. +// Currently fails on Mac Linux rel, see +// https://bugs.chromium.org/p/webrtc/issues/detail?id=15229 #define MAYBE_ConcurrentAccess DISABLED_ConcurrentAccess #else #define MAYBE_ConcurrentAccess ConcurrentAccess