diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-10 00:29:00 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-10 00:29:00 +0000 |
commit | cb2a526f8f913c5525cdca516b92d8b949303044 (patch) | |
tree | f08e5fe392158dc4f2dd78f338787929835c49c7 | |
parent | dfe5fc24e8dbc1a8e52af718d38d4342587dca99 (diff) | |
parent | b7c77a5836f69eb53b0587f376ba7bf0c26f8a24 (diff) | |
download | catbox-android13-qpr3-s10-release.tar.gz |
Snap for 9470583 from b7c77a5836f69eb53b0587f376ba7bf0c26f8a24 to tm-qpr3-releaseandroid-13.0.0_r83android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-release
Change-Id: I133dae629a00bd15585f7f5f5ccc4798f4cdda7e
-rw-r--r-- | tools/catbox-common/res/config/catbox-preparer.xml | 4 | ||||
-rw-r--r-- | tools/catbox-tradefed/res/config/catbox-performance-jank-media.xml | 51 |
2 files changed, 54 insertions, 1 deletions
diff --git a/tools/catbox-common/res/config/catbox-preparer.xml b/tools/catbox-common/res/config/catbox-preparer.xml index db9aaf7..21109c5 100644 --- a/tools/catbox-common/res/config/catbox-preparer.xml +++ b/tools/catbox-common/res/config/catbox-preparer.xml @@ -68,7 +68,9 @@ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher" /> <!-- Target Preparers - Run Shell Commands --> - <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer" /> + <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer"> + <option name="run-command" value="am start -n com.google.android.car.setupwizard/.ExitActivity" /> + </target_preparer> <!-- Target Preparers - Set Properties --> <target_preparer class="com.android.catbox.targetpreparer.SetDevicePropertyPreparer" /> diff --git a/tools/catbox-tradefed/res/config/catbox-performance-jank-media.xml b/tools/catbox-tradefed/res/config/catbox-performance-jank-media.xml new file mode 100644 index 0000000..4212fa3 --- /dev/null +++ b/tools/catbox-tradefed/res/config/catbox-performance-jank-media.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 Google Inc. + + 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="CATBox Jank Performance Test For Media."> + <!-- Plan --> + <option name="plan" value="catbox-performance-jank-media" /> + + <!-- Base File --> + <include name="catbox-performance-jank-base" /> + + <!-- Proc Load Options --> + <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:procload-collector:per_run:=true" /> + <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:procload-collector:proc-loadavg-interval:=20000" /> + <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:procload-collector:proc-loadavg-threshold:=2.0" /> + <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:procload-collector:proc-loadavg-timeout:=900000" /> + + <!-- Jank Options --> + <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:listener:=android.device.collectors.ProcLoadListener,android.device.collectors.JankListener" /> + <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:iterations:=20" /> + <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:favor-shell-commands:=true" /> + <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:rename-iterations:=true" /> + <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:iteration-separator:=$" /> + + <!-- Test Package --> + <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:package:android.platform.test.scenario.mediacenter" /> + + <!-- Test --> + <option name="compatibility:include-filter" value="AndroidAutomotiveMediaCenterScenarioTests android.platform.test.scenario.mediacenter.ScrollMicrobenchmark#testScrollDownAndUp" /> + + <!-- Jank Package --> + <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:jank-package-names:=com.android.car.media" /> + + <!-- Test Metrics Report Options --> + <option name="report-log-name" value="CatboxPerformanceTests" /> + <option name="report-test-name-mapping" key="android.platform.test.scenario.mediacenter.ScrollMicrobenchmark#testScrollDownAndUp" value="media_scroll_jank" /> + <option name="report-all-metrics" value="false" /> + <!-- TODO: b/247588415 Add metrics to APFE --> + <option name="report-metric-key-mapping" key="gfxinfo_com.android.car.media_janky_frames_percent-mean" value="jank_frames_percent" /> +</configuration>
\ No newline at end of file |