From 425e9672d5a75ed629bcd94a1baf13848471451c Mon Sep 17 00:00:00 2001 From: Zhuoyao Zhang Date: Thu, 31 Aug 2017 12:51:57 -0700 Subject: [PATCH] Fix VtsHalGraphicsComposerV2_1TargetTest Bug: 65252969 Test: make vts Change-Id: Id4543b385ca9dce532bbf08ef206897924d66acb --- .../VtsHalGraphicsComposerV2_1TargetTest.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp b/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp index 18955da0b3..9a749d7837 100644 --- a/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp +++ b/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp @@ -23,6 +23,7 @@ #include "VtsHalGraphicsMapperTestUtils.h" #include +#include #include #include @@ -703,10 +704,11 @@ TEST_F(GraphicsComposerHidlCommandTest, SET_LAYER_Z_ORDER) { } // namespace android int main(int argc, char** argv) { - ::testing::InitGoogleTest(&argc, argv); - - int status = RUN_ALL_TESTS(); - LOG(INFO) << "Test result = " << status; - - return status; + using android::hardware::graphics::composer::V2_1::tests::GraphicsComposerHidlEnvironment; + ::testing::AddGlobalTestEnvironment(GraphicsComposerHidlEnvironment::Instance()); + ::testing::InitGoogleTest(&argc, argv); + GraphicsComposerHidlEnvironment::Instance()->init(&argc, argv); + int status = RUN_ALL_TESTS(); + ALOGI("Test result = %d", status); + return status; }