Merge "Move main function out of namespace" into qt-dev

am: 5927a9b1f1

Change-Id: I154b181595aa1bd08bacf5ea12b18d28143d4d0e
This commit is contained in:
Hsin-Yi Chen
2019-06-20 20:35:26 -07:00
committed by android-build-merger

View File

@@ -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;
}