diff options
| author | Igor Murashkin <iam@google.com> | 2013-03-26 18:07:31 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-03-26 18:07:31 -0700 |
| commit | fb40d5de36fc93a1a3cab9c2cd73988ac52043a2 (patch) | |
| tree | eabe91b71543e61aa557be367b3dbc5467ce10c5 /tests/camera2 | |
| parent | e1c3ff664170ecfb92dab4c2d064c5e3ac3c4fcc (diff) | |
| download | hardware_libhardware-fb40d5de36fc93a1a3cab9c2cd73988ac52043a2.zip hardware_libhardware-fb40d5de36fc93a1a3cab9c2cd73988ac52043a2.tar.gz hardware_libhardware-fb40d5de36fc93a1a3cab9c2cd73988ac52043a2.tar.bz2 | |
camera2_test: Allow for HAL2 version >= 2.0 (i.e. 2.1, 3.0, etc)
Change-Id: If9004d2a6d5fc581b8f63814f2f115bcd7fa5a34
Diffstat (limited to 'tests/camera2')
| -rw-r--r-- | tests/camera2/CameraModuleFixture.h | 2 | ||||
| -rw-r--r-- | tests/camera2/camera2.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/camera2/CameraModuleFixture.h b/tests/camera2/CameraModuleFixture.h index cd8ddc4..01e1ad0 100644 --- a/tests/camera2/CameraModuleFixture.h +++ b/tests/camera2/CameraModuleFixture.h @@ -59,7 +59,7 @@ struct CameraModuleFixture { mNumberOfCameras = mModule->get_number_of_cameras(); ASSERT_LE(0, mNumberOfCameras); - ASSERT_EQ( + ASSERT_LE( CAMERA_MODULE_API_VERSION_2_0, mModule->common.module_api_version) << "Wrong module API version"; diff --git a/tests/camera2/camera2.cpp b/tests/camera2/camera2.cpp index de5b8c6..64803c0 100644 --- a/tests/camera2/camera2.cpp +++ b/tests/camera2/camera2.cpp @@ -60,10 +60,10 @@ class Camera2Test: public testing::Test { } int16_t version2_0 = CAMERA_MODULE_API_VERSION_2_0; - ASSERT_EQ(version2_0, module->module_api_version) + ASSERT_LE(version2_0, module->module_api_version) << "Camera module version is 0x" << std::hex << module->module_api_version - << ", not 2.0. (0x" + << ", should be at least 2.0. (0x" << std::hex << CAMERA_MODULE_API_VERSION_2_0 << ")"; sCameraModule = reinterpret_cast<camera_module_t*>(module); |