From 6ec5b21a815a7bd1a3a233505a550be9b09d18ce Mon Sep 17 00:00:00 2001 From: Zhuoyao Zhang Date: Tue, 17 Jan 2017 18:07:23 -0800 Subject: Update profiling code for host-side tests. * Parse profiling data for each test case. * Merge the profiling data for each test case at the end of test and upload the profiling info to web. Bug:34226555 Test: run vts -m VibratorHidlProfilingTest Change-Id: I9e13eada8e7db338a29c6943868d12e76844e2c4 --- .../functional/vts/testcases/hal/vr/hidl/host/VrHidlTest.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'vr') diff --git a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/VrHidlTest.py b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/VrHidlTest.py index 933fcdeea..d20e9ceac 100644 --- a/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/VrHidlTest.py +++ b/vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/VrHidlTest.py @@ -39,9 +39,6 @@ class VrHidlTest(base_test_with_webdb.BaseTestWithWebDbClass): self.dut.shell.one.Execute( "setprop vts.hal.vts.hidl.get_stub true") - if self.enable_profiling: - profiling_utils.EnableVTSProfiling(self.dut.shell.one) - self.dut.hal.InitHidlHal( target_type="vr", target_basepaths=["/system/lib64"], @@ -55,10 +52,18 @@ class VrHidlTest(base_test_with_webdb.BaseTestWithWebDbClass): """ If profiling is enabled for the test, collect the profiling data and disable profiling after the test is done. """ + if self.enable_profiling: + self.ProcessAndUploadTraceData() + + def setUpTest(self): + if self.enable_profiling: + profiling_utils.EnableVTSProfiling(self.dut.shell.one) + + def tearDownTest(self): if self.enable_profiling: profiling_trace_path = getattr( self, self.VTS_PROFILING_TRACING_PATH, "") - self.ProcessAndUploadTraceData(self.dut, profiling_trace_path) + self.ProcessTraceDataForTestCase(self.dut, profiling_trace_path) profiling_utils.DisableVTSProfiling(self.dut.shell.one) def testVrBasic(self): -- cgit v1.2.3