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

Commit 904b2b80 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Store flicker files in the local directories instead of using /sdcard/"... 

Merge "Store flicker files in the local directories instead of using /sdcard/" into udc-qpr-dev am: 0986a937 am: d6fb7bc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23450799



Change-Id: Ica86b58e91ffedeec388e96640f12229b86b521e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e0a8804c d6fb7bc8

libs/WindowManager/Shell/tests/flicker/AndroidTestTemplate.xml

+40 −40
Original line number Diff line number Diff line
@@ -33,14 +33,15 @@ 
        <!-- ensure lock screen mode is swipe -->

        <option name="run-command" value="locksettings set-disabled false"/>

        <!-- restart launcher to activate TAPL -->

        <option name="run-command" value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher" />

        <!-- Ensure output directory is empty at the start -->

        <option name="run-command" value="rm -rf /sdcard/flicker" />

        <option name="run-command"

                value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher"/>

        <!-- Increase trace size: 20mb for WM and 80mb for SF -->

        <option name="run-command" value="cmd window tracing size 20480"/>

        <option name="run-command" value="su root service call SurfaceFlinger 1029 i32 81920"/>

    </target_preparer>

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

        <option name="test-user-token" value="%TEST_USER%"/>

        <option name="run-command" value="rm -rf /data/user/%TEST_USER%/files/*"/>

        <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1"/>

        <option name="run-command" value="settings put system show_touches 1"/>

        <option name="run-command" value="settings put system pointer_location 1"/>
@@ -84,15 +85,14 @@ 
    <!-- 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>

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

        <option name="pull-pattern-keys" value="(\w)+\.winscope" />

        <option name="pull-pattern-keys" value="(\w)+\.mp4" />

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

        <option name="clean-up" value="true" />

    </metrics_collector>

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

        <option name="directory-keys" value="/sdcard/flicker" />

        <option name="directory-keys"

                value="/data/user/0/com.android.wm.shell.flicker/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.wm.shell.flicker.bubbles/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.server.wm.flicker.pip/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.server.wm.flicker.splitscreen/files"/>

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

        <option name="clean-up" value="true"/>

    </metrics_collector>

tests/FlickerTests/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ android_test { 
    name: "FlickerTestsQuickswitch",

    defaults: ["FlickerTestsDefault"],

    additional_manifests: ["manifests/AndroidManifestQuickswitch.xml"],

    package_name: "com.android.server.wm.flicker.rotation",

    instrumentation_target_package: "com.android.server.wm.flicker.rotation",

    package_name: "com.android.server.wm.flicker.quickswitch",

    instrumentation_target_package: "com.android.server.wm.flicker.quickswitch",

    srcs: [

        ":FlickerTestsBase-src",

        ":FlickerTestsQuickswitch-src",

tests/FlickerTests/AndroidTestTemplate.xml

+44 −35
Original line number Diff line number Diff line
@@ -21,14 +21,15 @@ 
        <!-- disable betterbug as it's log collection dialogues cause flakes in e2e tests -->

        <option name="run-command" value="pm disable com.google.android.internal.betterbug"/>

        <!-- restart launcher to activate TAPL -->

        <option name="run-command" value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher" />

        <!-- Ensure output directory is empty at the start -->

        <option name="run-command" value="rm -rf /sdcard/flicker" />

        <option name="run-command"

                value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher"/>

        <!-- Increase trace size: 20mb for WM and 80mb for SF -->

        <option name="run-command" value="cmd window tracing size 20480"/>

        <option name="run-command" value="su root service call SurfaceFlinger 1029 i32 81920"/>

    </target_preparer>

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

        <option name="test-user-token" value="%TEST_USER%"/>

        <option name="run-command" value="rm -rf /data/user/%TEST_USER%/files/*"/>

        <option name="run-command" value="settings put secure show_ime_with_hard_keyboard 1"/>

        <option name="run-command" value="settings put system show_touches 1"/>

        <option name="run-command" value="settings put system pointer_location 1"/>
@@ -72,11 +73,19 @@ 
    <!-- 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>

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

        <option name="pull-pattern-keys" value="(\w)+\.winscope" />

        <option name="pull-pattern-keys" value="(\w)+\.mp4" />

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

        <option name="directory-keys"

                value="/data/user/0/com.android.server.wm.flicker/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.server.wm.flicker.close/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.server.wm.flicker.ime/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.server.wm.flicker.launch/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.server.wm.flicker.quickswitch/files"/>

        <option name="directory-keys"

                value="/data/user/0/com.android.server.wm.flicker.rotation/files"/>

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

        <option name="clean-up" value="true"/>

    </metrics_collector>

</configuration>