diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2019-06-20 20:35:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-20 20:35:26 -0700 |
| commit | 14a53832d431e0bbf003084ad47987dd004c70fe (patch) | |
| tree | f00c45791325d62045a2731dd81771e61ef7ad88 | |
| parent | e0eaa60ab733001ec10d150bf1b4e97ec6c8e744 (diff) | |
| parent | 5927a9b1f1d48a547755753414a960cb22661059 (diff) | |
| download | platform_hardware_interfaces-14a53832d431e0bbf003084ad47987dd004c70fe.tar.gz platform_hardware_interfaces-14a53832d431e0bbf003084ad47987dd004c70fe.tar.bz2 platform_hardware_interfaces-14a53832d431e0bbf003084ad47987dd004c70fe.zip | |
Merge "Move main function out of namespace" into qt-dev
am: 5927a9b1f1
Change-Id: I154b181595aa1bd08bacf5ea12b18d28143d4d0e
| -rw-r--r-- | power/stats/1.0/vts/functional/VtsHalPowerStatsV1_0TargetTest.cpp | 13 |
1 files changed, 7 insertions, 6 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(); } +} // 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 |