diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc index 4c2263d04..ac271345a 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -278,7 +278,8 @@ class VideoCaptureTest : public testing::Test { unsigned int number_of_devices_; }; -TEST_F(VideoCaptureTest, CreateDelete) { +// Video capture tests broken on Android, see webrtc:3768. +TEST_F(VideoCaptureTest, DISABLED_ON_ANDROID(CreateDelete)) { for (int i = 0; i < 5; ++i) { int64_t start_time = TickTime::MillisecondTimestamp(); TestVideoCaptureCallback capture_observer; @@ -315,7 +316,8 @@ TEST_F(VideoCaptureTest, CreateDelete) { } } -TEST_F(VideoCaptureTest, Capabilities) { +// Video capture tests broken on Android, see webrtc:3768. +TEST_F(VideoCaptureTest, DISABLED_ON_ANDROID(Capabilities)) { #ifdef WEBRTC_MAC printf("Video capture capabilities are not supported on Mac.\n"); return; @@ -470,7 +472,8 @@ class VideoCaptureExternalTest : public testing::Test { }; // Test input of external video frames. -TEST_F(VideoCaptureExternalTest, TestExternalCapture) { +// Video capture tests broken on Android, see webrtc:3768. +TEST_F(VideoCaptureExternalTest, DISABLED_ON_ANDROID(TestExternalCapture)) { unsigned int length = webrtc::CalcBufferSize(webrtc::kI420, test_frame_.width(), test_frame_.height()); @@ -552,7 +555,13 @@ TEST_F(VideoCaptureExternalTest, DISABLED_TestExternalCaptureI420) { // Test frame rate and no picture alarm. // Flaky on Win32, see webrtc:3270. -TEST_F(VideoCaptureExternalTest, DISABLED_ON_WIN(FrameRate)) { +// Video capture tests broken on Android, see webrtc:3768. +#if defined(_WIN32) || defined(WEBRTC_ANDROID) +#define MAYBE_FrameRate DISABLED_FrameRate +#else +#define MAYBE_FrameRate FrameRate +#endif +TEST_F(VideoCaptureExternalTest, MAYBE_FrameRate) { int64_t testTime = 3; TickTime startTime = TickTime::Now(); @@ -589,7 +598,8 @@ TEST_F(VideoCaptureExternalTest, DISABLED_ON_WIN(FrameRate)) { capture_feedback_.frame_rate() <= 33); } -TEST_F(VideoCaptureExternalTest, Rotation) { +// Video capture tests broken on Android, see webrtc:3768. +TEST_F(VideoCaptureExternalTest, DISABLED_ON_ANDROID(Rotation)) { EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kCameraRotate0)); unsigned int length = webrtc::CalcBufferSize(webrtc::kI420, test_frame_.width(), @@ -611,3 +621,8 @@ TEST_F(VideoCaptureExternalTest, Rotation) { EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(), length, capture_callback_.capability(), 0)); } + +// Video capture tests broken on Android, see webrtc:3768. +// Add dummy test that always passes to avoid the entire test returning exit +// code 1 when zero tests have executed. +TEST_F(VideoCaptureExternalTest, Dummy) {}