diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-23 14:57:29 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-23 14:57:29 +0000 |
| commit | 28bec69f6ca790f3986c84763ed7100ee68ed100 (patch) | |
| tree | 9694e2951750d30530178e976c8a9523a12d343c /media/video | |
| parent | 08d4a50ad7b32162353690e9a93caaa3fb441b04 (diff) | |
| download | chromium_src-28bec69f6ca790f3986c84763ed7100ee68ed100.zip chromium_src-28bec69f6ca790f3986c84763ed7100ee68ed100.tar.gz chromium_src-28bec69f6ca790f3986c84763ed7100ee68ed100.tar.bz2 | |
Fix and use the "MAYBE_CaptureMjpeg" macro for the CaptureMjpeg unit test.
The macro wasn't actually being used so the test was failing on Mac (presumably) and Windows (verifiably).
TEST=Run "media_unittests --gtest_filter=*VideoCapture*". All tests should pass on Mac and Windows.
BUG=none
TBR=mflodman
Review URL: https://chromiumcodereview.appspot.com/11416158
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
| -rw-r--r-- | media/video/capture/video_capture_device_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc index 74902f4..4c8b046 100644 --- a/media/video/capture/video_capture_device_unittest.cc +++ b/media/video/capture/video_capture_device_unittest.cc @@ -21,15 +21,15 @@ // Mac/QTKit will always give you the size you ask for and this case will fail. #define MAYBE_AllocateBadSize DISABLED_AllocateBadSize // We will always get ARGB from the Mac/QTKit implementation. -#define MAYBE_MJPEG DISABLED_CaptureMjpeg +#define MAYBE_CaptureMjpeg DISABLED_CaptureMjpeg #elif defined(OS_WIN) -#define MAYBE_AllocateBadSize AllocateBadSizei +#define MAYBE_AllocateBadSize AllocateBadSize // Windows currently uses DirectShow to convert from MJPEG and a raw format is // always delivered. -#define MAYBE_MJPEG DISABLED_CaptureMjpeg +#define MAYBE_CaptureMjpeg DISABLED_CaptureMjpeg #else #define MAYBE_AllocateBadSize AllocateBadSize -#define MAYBE_MJPEG CaptureMjpeg +#define MAYBE_CaptureMjpeg CaptureMjpeg #endif using ::testing::_; @@ -261,7 +261,7 @@ TEST_F(VideoCaptureDeviceTest, TestFakeCapture) { } // Start the camera in 720p to capture MJPEG instead of a raw format. -TEST_F(VideoCaptureDeviceTest, CaptureMjpeg) { +TEST_F(VideoCaptureDeviceTest, MAYBE_CaptureMjpeg) { VideoCaptureDevice::GetDeviceNames(&names_); if (!names_.size()) { DVLOG(1) << "No camera available. Exiting test."; |