diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-10-29 18:37:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 18:37:02 -0700 |
| commit | fc2a7951518b4d39ea88b599ba37cc9ec57418dd (patch) | |
| tree | 7861596a0ded9425a0ad76d7b03acdb4b136fbc7 /tests | |
| parent | c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0 (diff) | |
| parent | b44ff6508bbcb8df751b5815dd4dfbd4cae252f7 (diff) | |
| download | hardware_libhardware-fc2a7951518b4d39ea88b599ba37cc9ec57418dd.zip hardware_libhardware-fc2a7951518b4d39ea88b599ba37cc9ec57418dd.tar.gz hardware_libhardware-fc2a7951518b4d39ea88b599ba37cc9ec57418dd.tar.bz2 | |
am b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices
* commit 'b44ff6508bbcb8df751b5815dd4dfbd4cae252f7':
Camera2 Test: Skip CameraModuleTest for HAL V1 devices
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/camera2/CameraModuleTests.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/tests/camera2/CameraModuleTests.cpp b/tests/camera2/CameraModuleTests.cpp index ae4267b..828c56a 100644 --- a/tests/camera2/CameraModuleTests.cpp +++ b/tests/camera2/CameraModuleTests.cpp @@ -64,11 +64,22 @@ TEST_F(CameraModuleTest, LoadModule) { TEST_EXTENSION_FORKING_INIT; + status_t stat; for (int i = 0; i < mNumberOfCameras; ++i) { - CreateCamera(i, &mDevice); - ASSERT_EQ(OK, initializeDevice(i)) - << "Failed to initialize device " << i; - mDevice.clear(); + if (isDeviceVersionHal2(i, &stat) && stat == OK) { + CreateCamera(i, &mDevice); + ASSERT_EQ(OK, initializeDevice(i)) + << "Failed to initialize device " << i; + mDevice.clear(); + } else { + const ::testing::TestInfo* const test_info = + ::testing::UnitTest::GetInstance()->current_test_info(); + std::cerr << "Skipping test " + << test_info->test_case_name() << "." + << test_info->name() + << " because HAL device version is V1" + << std::endl; + } } } |