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

Commit f3c012ec authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Move window manager perf test to a new package" into rvc-dev am: 0cbca1a2 

Change-Id: Ib1d815dd544a14fdb1c088abbd213d2a794135a5
parents 5c625cda 0cbca1a2

apct-tests/perftests/core/AndroidTest.xml

+0 −5
Original line number Original line Diff line number Diff line
@@ -25,9 +25,4 @@ 
        <option name="package" value="com.android.perftests.core" />

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

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

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

    </test>

    </test>



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

        <option name="directory-keys" value="/data/local/CorePerfTests" />

        <option name="collect-on-run-ended-only" value="true" />

    </metrics_collector>

</configuration>
 
</configuration>

apct-tests/perftests/windowmanager/Android.bp

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
// Copyright (C) 2020 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



android_test {

    name: "WmPerfTests",

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

    static_libs: [

        "androidx.test.rules",

        "androidx.annotation_annotation",

        "apct-perftests-utils",

    ],

    test_suites: ["device-tests"],

    platform_apis: true,

    certificate: "platform",

}

apct-tests/perftests/windowmanager/AndroidManifest.xml

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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



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



    <application>

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

        <activity android:name="android.perftests.utils.PerfTestActivity">

          <intent-filter>

            <action android:name="com.android.perftests.core.PERFTEST" />

          </intent-filter>

        </activity>

    </application>



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

        android:targetPackage="com.android.perftests.wm"/>

</manifest>

apct-tests/perftests/windowmanager/AndroidTest.xml

0 → 100644
+33 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs WmPerfTests 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="WmPerfTests.apk" />

    </target_preparer>



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

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

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

    </test>



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

        <option name="directory-keys" value="/data/local/WmPerfTests" />

        <option name="collect-on-run-ended-only" value="true" />

    </metrics_collector>

</configuration>