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

Commit 68a2606d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename protolog tests to ui tracing perf tests" into main

parents 047cf4e9 a1b85e08

apct-tests/perftests/tracing/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
// limitations under the License.



android_test {

    name: "ProtologPerfTests",

    name: "UiTracingPerfTests",

    team: "trendy_team_windowing_tools",

    srcs: ["src/**/*.java"],

    static_libs: [

apct-tests/perftests/tracing/AndroidManifest.xml

+2 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

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

    package="android.tracing.perftests">



    <!-- For perfetto trace files -->

    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
@@ -25,7 +25,6 @@ 
    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.perftests.protolog">

        <!-- <meta-data android:name="listener" android:value="android.protolog.ProtologPerfRunListener" /> -->

        android:targetPackage="android.tracing.perftests">

    </instrumentation>

</manifest>

apct-tests/perftests/tracing/AndroidTest.xml

+3 −3
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs ProtologPerfTests metric instrumentation.">

<configuration description="Runs UiTracingPerfTests metric instrumentation.">

    <option name="config-descriptor:metadata" key="test-type" value="performance" />



    <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="ProtologPerfTests.apk" />

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

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
@@ -40,7 +40,7 @@ 
    <option name="isolated-storage" value="false" />



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

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

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

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



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