summaryrefslogtreecommitdiffstats
path: root/power
diff options
context:
space:
mode:
authorHsin-Yi Chen <hsinyichen@google.com>2019-06-18 16:05:57 +0800
committerHsin-Yi Chen <hsinyichen@google.com>2019-06-18 16:09:36 +0800
commit88eaae691326cabe2dbcf778815b8801c4dddaa3 (patch)
treee5b5746e709d97a7a922886596130739ec797473 /power
parent16b2c77456144b7bf6ba261ee7e8c4e4290d404e (diff)
downloadandroid_hardware_interfaces-88eaae691326cabe2dbcf778815b8801c4dddaa3.tar.gz
android_hardware_interfaces-88eaae691326cabe2dbcf778815b8801c4dddaa3.tar.bz2
android_hardware_interfaces-88eaae691326cabe2dbcf778815b8801c4dddaa3.zip
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
Diffstat (limited to 'power')
-rw-r--r--power/stats/1.0/vts/functional/VtsHalPowerStatsV1_0TargetTest.cpp13
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 9f007e47f..835a47b02 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