hardware/interfaces
| Révision | 8d2d1d08a15fccf8deccdafefdcfad382f8ba018 (tree) |
|---|---|
| l'heure | 2017-09-06 03:33:42 |
| Auteur | Zhuoyao Zhang <zhuoyao@goog...> |
| Commiter | Android (Google) Code Review |
Merge "Fix VtsHalGraphicsComposerV2_1TargetTest" into oc-mr1-dev
| @@ -23,6 +23,7 @@ | ||
| 23 | 23 | #include "VtsHalGraphicsMapperTestUtils.h" |
| 24 | 24 | |
| 25 | 25 | #include <VtsHalHidlTargetTestBase.h> |
| 26 | +#include <VtsHalHidlTargetTestEnvBase.h> | |
| 26 | 27 | #include <unistd.h> |
| 27 | 28 | |
| 28 | 29 | #include <algorithm> |
| @@ -703,10 +704,11 @@ TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_Z_ORDER) { | ||
| 703 | 704 | } // namespace android |
| 704 | 705 | |
| 705 | 706 | int main(int argc, char** argv) { |
| 706 | - ::testing::InitGoogleTest(&argc, argv); | |
| 707 | - | |
| 708 | - int status = RUN_ALL_TESTS(); | |
| 709 | - LOG(INFO) << "Test result = " << status; | |
| 710 | - | |
| 711 | - return status; | |
| 707 | + using android::hardware::graphics::composer::V2_1::tests::GraphicsComposerHidlEnvironment; | |
| 708 | + ::testing::AddGlobalTestEnvironment(GraphicsComposerHidlEnvironment::Instance()); | |
| 709 | + ::testing::InitGoogleTest(&argc, argv); | |
| 710 | + GraphicsComposerHidlEnvironment::Instance()->init(&argc, argv); | |
| 711 | + int status = RUN_ALL_TESTS(); | |
| 712 | + ALOGI("Test result = %d", status); | |
| 713 | + return status; | |
| 712 | 714 | } |
Fork
graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp