From 88eaae691326cabe2dbcf778815b8801c4dddaa3 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Tue, 18 Jun 2019 16:05:57 +0800 Subject: [PATCH] Move main function out of namespace Bug: 135473483 Test: adb shell /data/local/tmp/VtsHalPowerStatsV1_0TargetTest \ --list_registered_services Test: vts-tradefed run vts -m VtsHalPowerStatsV1_0Target Change-Id: I01084afbf48cff268288a8cce23328a2e4d1e4a0 --- .../VtsHalPowerStatsV1_0TargetTest.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/power/stats/1.0/vts/functional/VtsHalPowerStatsV1_0TargetTest.cpp b/power/stats/1.0/vts/functional/VtsHalPowerStatsV1_0TargetTest.cpp index 9f007e47f2..835a47b023 100644 --- a/power/stats/1.0/vts/functional/VtsHalPowerStatsV1_0TargetTest.cpp +++ b/power/stats/1.0/vts/functional/VtsHalPowerStatsV1_0TargetTest.cpp @@ -566,15 +566,16 @@ TEST_F(PowerStatsHidlTest, StreamEnergyData) { thread1.join(); } -int main(int argc, char** argv) { - ::testing::AddGlobalTestEnvironment(PowerStatsHidlEnv::Instance()); - ::testing::InitGoogleTest(&argc, argv); - PowerStatsHidlEnv::Instance()->init(&argc, argv); - int status = RUN_ALL_TESTS(); - LOG(INFO) << "Test result = " << status; - return status; -} } // namespace vts } // namespace stats } // namespace power } // namespace android + +int main(int argc, char** argv) { + ::testing::AddGlobalTestEnvironment(android::power::stats::vts::PowerStatsHidlEnv::Instance()); + ::testing::InitGoogleTest(&argc, argv); + android::power::stats::vts::PowerStatsHidlEnv::Instance()->init(&argc, argv); + int status = RUN_ALL_TESTS(); + LOG(INFO) << "Test result = " << status; + return status; +}