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

Commit ca502457 authored by Gopinath Elanchezhian's avatar Gopinath Elanchezhian Committed by Android (Google) Code Review
Browse files

Merge "Update atest configs for multi user test."

parents 55a12c79 89c157c4

apct-tests/perftests/multiuser/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -22,5 +22,6 @@ android_test { 
    ],

    platform_apis: true,

    test_suites: ["device-tests"],

    data: [":perfetto_artifacts"],

    certificate: "platform",

}

apct-tests/perftests/multiuser/AndroidManifest.xml

+0 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.perftests.multiuser">



    <uses-sdk android:targetSdkVersion="28" />



    <uses-permission android:name="android.permission.CONTROL_KEYGUARD" />

    <uses-permission android:name="android.permission.MANAGE_USERS" />
@@ -25,8 +24,6 @@ 
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />

    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.REAL_GET_TASKS" />



    <application>

        <uses-library android:name="android.test.runner" />

apct-tests/perftests/multiuser/AndroidTest.xml

+34 −0
Original line number Diff line number Diff line
@@ -16,14 +16,48 @@ 
<configuration description="Runs MultiUserPerfTests metric instrumentation.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-metric-instrumentation" />



    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="MultiUserPerfTests.apk" />

        <option name="test-file-name" value="MultiUserPerfDummyApp.apk" />

    </target_preparer>



    <!-- Needed for pushing the trace config file -->

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

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

        <option name="push-file" key="trace_config_detailed.textproto" value="/data/misc/perfetto-traces/trace_config.textproto" />

    </target_preparer>



    <!-- Needed for pulling the collected trace config on to the host -->

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

        <option name="pull-pattern-keys" value="perfetto_file_path" />

    </metrics_collector>



    <!-- Needed for storing the perfetto trace files in the sdcard/test_results-->

    <option name="isolated-storage" value="false" />



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

        <option name="package" value="com.android.perftests.multiuser" />

        <option name="hidden-api-checks" value="false"/>



        <!-- Listener related args for collecting the traces and waiting for the device to stabilize. -->

        <option name="device-listeners" value="android.device.collectors.ProcLoadListener,android.device.collectors.PerfettoListener" />

        <!-- Guarantee that user defined RunListeners will be running before any of the default listeners defined in this runner. -->

        <option name="instrumentation-arg" key="newRunListenerMode" value="true" />



        <!-- ProcLoadListener related arguments -->

        <!-- Wait for device last minute threshold to reach 3 with 2 minute timeout before starting the test run -->

        <option name="instrumentation-arg" key="procload-collector:per_run" value="true" />

        <option name="instrumentation-arg" key="proc-loadavg-threshold" value="3" />

        <option name="instrumentation-arg" key="proc-loadavg-timeout" value="120000" />

        <option name="instrumentation-arg" key="proc-loadavg-interval" value="10000" />



        <!-- PerfettoListener related arguments -->

        <option name="instrumentation-arg" key="perfetto_config_text_proto" value="true" />

        <option name="instrumentation-arg" key="perfetto_config_file" value="trace_config.textproto" />



        <option name="instrumentation-arg" key="newRunListenerMode" value="true" />



    </test>

</configuration>