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

Commit 6ec5b21a authored by Zhuoyao Zhang's avatar Zhuoyao Zhang
Browse files

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
parent 1fcf5937

sensors/1.0/vts/functional/vts/testcases/hal/sensors/hidl/host/SensorsHidlTest.py

+9 −4
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ class SensorsHidlTest(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="sensors",

            target_basepaths=self.dut.libPaths,
@@ -59,10 +56,18 @@ class SensorsHidlTest(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 testSensorsBasic(self):

vehicle/2.0/vts/functional/vts/testcases/hal/vehicle/hidl/host/VehicleHidlTest.py

+9 −4
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ class VehicleHidlTest(base_test_with_webdb.BaseTestWithWebDbClass): 
        self.dut.shell.InvokeTerminal("one")

        self.dut.shell.one.Execute("setenforce 0")  # SELinux permissive mode



        if self.enable_profiling:

            profiling_utils.EnableVTSProfiling(self.dut.shell.one)



        self.dut.hal.InitHidlHal(

            target_type="vehicle",

            target_basepaths=self.dut.libPaths,
@@ -57,10 +54,18 @@ class VehicleHidlTest(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 testListProperties(self):

vibrator/1.0/vts/functional/vts/testcases/hal/vibrator/hidl/host/VibratorHidlTest.py

+9 −4
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ class VibratorHidlTest(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="vibrator",

            target_basepaths=self.dut.libPaths,
@@ -55,10 +52,18 @@ class VibratorHidlTest(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 testVibratorBasic(self):

vr/1.0/vts/functional/vts/testcases/hal/vr/hidl/host/VrHidlTest.py

+9 −4
Original line number Diff line number Diff line
@@ -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):