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

Commit 037257fc authored by Paul Thomson's avatar Paul Thomson
Browse files

Update GpuWorkTracepointTest 

Update test to handle the modified tracepoint format. Also, ensure the
test always runs without adb root.

Bug: b/221096545
Change-Id: I0138f11da97caa6c6c65b9e4faae7e21e0ef1148
parent b829a311

services/gpuservice/vts/AndroidTest.xml

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
     limitations under the License.

-->

<configuration description="Runs GpuServiceVendorTests">

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">

        <option name="force-root" value="false" />

    </target_preparer>

    <test class="com.android.tradefed.testtype.HostTest" >

        <option name="jar" value="GpuServiceVendorTests.jar" />

    </test>

services/gpuservice/vts/src/com/android/tests/gpuservice/GpuWorkTracepointTest.java

+5 −6
Original line number Diff line number Diff line
@@ -78,12 +78,11 @@ public class GpuWorkTracepointTest extends BaseHostJUnit4Test { 
                "\tfield:unsigned char common_flags;\toffset:2;\tsize:1;\tsigned:0;",

                "\tfield:unsigned char common_preempt_count;\toffset:3;\tsize:1;\tsigned:0;",

                "\tfield:int common_pid;\toffset:4;\tsize:4;\tsigned:1;",

                "\tfield:u32 uid;\toffset:8;\tsize:4;\tsigned:0;",

                "\tfield:u32 frequency;\toffset:12;\tsize:4;\tsigned:0;",

                "\tfield:u64 start_time;\toffset:16;\tsize:8;\tsigned:0;",

                "\tfield:u64 end_time;\toffset:24;\tsize:8;\tsigned:0;",

                "\tfield:u64 flags;\toffset:32;\tsize:8;\tsigned:0;",

                "\tfield:u32 thermally_throttled_max_frequency_khz;\toffset:40;\tsize:4;\tsigned:0;"

                "\tfield:u32 gpu_id;\toffset:8;\tsize:4;\tsigned:0;",

                "\tfield:u32 uid;\toffset:12;\tsize:4;\tsigned:0;",

                "\tfield:u64 start_time_ns;\toffset:16;\tsize:8;\tsigned:0;",

                "\tfield:u64 end_time_ns;\toffset:24;\tsize:8;\tsigned:0;",

                "\tfield:u64 total_active_duration_ns;\toffset:32;\tsize:8;\tsigned:0;"

        );



        // We use |fail| rather than |assertEquals| because it allows us to give a clearer message.