summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-07-22 19:10:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-07-22 19:10:49 +0000
commit2649194f9a3db7c63e17e9902fc13be0b51b84c6 (patch)
treeaa9a4f37c9f722a8fc06ec154f220619a13fb818
parentea33b259715c6bcbfa5f7f19f37c718b36c03a1c (diff)
parentee9d7a9f3fbc346c1769eaba39ed3512b0d7722b (diff)
Merge "Reland "Add DefaultUITraceListener to InputTests"" into main
-rw-r--r--tests/Input/Android.bp1
-rw-r--r--tests/Input/AndroidTest.xml6
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/Input/Android.bp b/tests/Input/Android.bp
index f367c38b06e9..06c2651b604d 100644
--- a/tests/Input/Android.bp
+++ b/tests/Input/Android.bp
@@ -48,6 +48,7 @@ android_test {
"testables",
"testng",
"truth",
+ "ui-trace-collector",
],
libs: [
"android.test.mock",
diff --git a/tests/Input/AndroidTest.xml b/tests/Input/AndroidTest.xml
index 4a99bd4f1801..bc9322fbd3dc 100644
--- a/tests/Input/AndroidTest.xml
+++ b/tests/Input/AndroidTest.xml
@@ -22,6 +22,10 @@
<option name="shell-timeout" value="660s" />
<option name="test-timeout" value="600s" />
<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
+ <option name="device-listeners" value="android.tools.collectors.DefaultUITraceListener"/>
+ <!-- DefaultUITraceListener args -->
+ <option name="instrumentation-arg" key="skip_test_success_metrics" value="true"/>
+ <option name="instrumentation-arg" key="per_class" value="true"/>
</test>
<object class="com.android.tradefed.testtype.suite.module.TestFailureModuleController"
type="module_controller">
@@ -32,6 +36,8 @@
<option name="pull-pattern-keys" value="input_.*" />
<!-- Pull files created by tests, like the output of screenshot tests -->
<option name="directory-keys" value="/sdcard/Download/InputTests" />
+ <!-- Pull perfetto traces from DefaultUITraceListener -->
+ <option name="pull-pattern-keys" value="perfetto_file_path*" />
<option name="collect-on-run-ended-only" value="false" />
</metrics_collector>
</configuration>