diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-12-05 12:38:20 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-12-05 12:38:20 -0800 |
| commit | 20ebefd966eed9da545ab645199c2f93ca93af20 (patch) | |
| tree | 861480695e14cdaaf8a499defcd1c1fc1d78bdca /tests | |
| parent | 047510b132e33c26607b4b93e806884aa4d13f19 (diff) | |
| parent | eed5dceb4a0bc02f50f236ab191d30c49c58f610 (diff) | |
| download | hardware_libhardware-20ebefd966eed9da545ab645199c2f93ca93af20.zip hardware_libhardware-20ebefd966eed9da545ab645199c2f93ca93af20.tar.gz hardware_libhardware-20ebefd966eed9da545ab645199c2f93ca93af20.tar.bz2 | |
Merge commit 'eed5dceb4a0bc02f50f236ab191d30c49c58f610' into HEAD
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; + } } } |