Index: media/video/capture/video_capture_device_unittest.cc |
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc |
index 7cb40bc27139fc7482867cb60c6ec10e685b0c7a..4e62989c108c89658e7c97892998205975256419 100644 |
--- a/media/video/capture/video_capture_device_unittest.cc |
+++ b/media/video/capture/video_capture_device_unittest.cc |
@@ -62,6 +62,10 @@ class VideoCaptureDeviceTest : public testing::Test { |
}; |
TEST_F(VideoCaptureDeviceTest, OpenInvalidDevice) { |
+#if defined(OS_MACOSX) |
scherkus (not reviewing)
2011/10/07 17:17:55
will these tests ever be supported?
if so you sho
mflodman_chromium_OOO
2011/10/10 12:56:52
Thanks, changed!
Yes, the plan is to support them
dmac
2011/10/11 00:25:47
Not to be annoying, but wouldn't it be better to w
|
+ // Test not supported for Mac. |
+ return; |
+#endif |
VideoCaptureDevice::Name device_name; |
device_name.device_name = "jibberish"; |
device_name.unique_id = "jibberish"; |
@@ -70,6 +74,10 @@ TEST_F(VideoCaptureDeviceTest, OpenInvalidDevice) { |
} |
TEST_F(VideoCaptureDeviceTest, CaptureVGA) { |
+#if defined(OS_MACOSX) |
+ // Test not supported for Mac. |
+ return; |
+#endif |
VideoCaptureDevice::GetDeviceNames(&names_); |
if (!names_.size()) { |
LOG(WARNING) << "No camera available. Exiting test."; |
@@ -97,6 +105,10 @@ TEST_F(VideoCaptureDeviceTest, CaptureVGA) { |
} |
TEST_F(VideoCaptureDeviceTest, Capture720p) { |
+#if defined(OS_MACOSX) |
+ // Test not supported for Mac. |
+ return; |
+#endif |
VideoCaptureDevice::GetDeviceNames(&names_); |
if (!names_.size()) { |
LOG(WARNING) << "No camera available. Exiting test."; |
@@ -126,6 +138,10 @@ TEST_F(VideoCaptureDeviceTest, Capture720p) { |
} |
TEST_F(VideoCaptureDeviceTest, AllocateSameCameraTwice) { |
+#if defined(OS_MACOSX) |
+ // Test not supported for Mac. |
+ return; |
+#endif |
VideoCaptureDevice::GetDeviceNames(&names_); |
if (!names_.size()) { |
LOG(WARNING) << "No camera available. Exiting test."; |
@@ -153,6 +169,10 @@ TEST_F(VideoCaptureDeviceTest, AllocateSameCameraTwice) { |
} |
TEST_F(VideoCaptureDeviceTest, AllocateBadSize) { |
+#if defined(OS_MACOSX) |
+ // Test not supported for Mac. |
+ return; |
+#endif |
VideoCaptureDevice::GetDeviceNames(&names_); |
if (!names_.size()) { |
LOG(WARNING) << "No camera available. Exiting test."; |
@@ -174,6 +194,10 @@ TEST_F(VideoCaptureDeviceTest, AllocateBadSize) { |
} |
TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) { |
+#if defined(OS_MACOSX) |
+ // Test not supported for Mac. |
+ return; |
+#endif |
VideoCaptureDevice::GetDeviceNames(&names_); |
if (!names_.size()) { |
LOG(WARNING) << "No camera available. Exiting test."; |
@@ -206,6 +230,10 @@ TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) { |
} |
TEST_F(VideoCaptureDeviceTest, DeAllocateCameraWhileRunning) { |
+#if defined(OS_MACOSX) |
+ // Test not supported for Mac. |
+ return; |
+#endif |
VideoCaptureDevice::GetDeviceNames(&names_); |
if (!names_.size()) { |
LOG(WARNING) << "No camera available. Exiting test."; |
@@ -230,6 +258,10 @@ TEST_F(VideoCaptureDeviceTest, DeAllocateCameraWhileRunning) { |
} |
TEST_F(VideoCaptureDeviceTest, TestFakeCapture) { |
+#if defined(OS_MACOSX) |
+ // Test not supported for Mac. |
+ return; |
+#endif |
VideoCaptureDevice::Names names; |
FakeVideoCaptureDevice::GetDeviceNames(&names); |