Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4937e50 authored by Hsin-Yi Chen's avatar Hsin-Yi Chen Committed by android-build-merger
Browse files

Merge "Move main function out of namespace" into qt-dev am: 5927a9b1 am: fe2c7172

am: f3020825

Change-Id: I74072c0bf49dec65821453786edc797b8c5d5065
parents 184671eb f3020825
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -566,15 +566,16 @@ TEST_F(PowerStatsHidlTest, StreamEnergyData) {
    thread1.join();
}

}  // namespace vts
}  // namespace stats
}  // namespace power
}  // namespace android

int main(int argc, char** argv) {
    ::testing::AddGlobalTestEnvironment(PowerStatsHidlEnv::Instance());
    ::testing::AddGlobalTestEnvironment(android::power::stats::vts::PowerStatsHidlEnv::Instance());
    ::testing::InitGoogleTest(&argc, argv);
    PowerStatsHidlEnv::Instance()->init(&argc, argv);
    android::power::stats::vts::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