[automerger skipped] Regenerate the ART MTS definition (2022-09-22). am: fbb33bd32c -s ours
am skip reason: Merged-In I624c93e94eb84aa280d70cc7e1c6aa54d2a93f65 with SHA-1 774a9b25fa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/test/mts/+/23728558
Change-Id: I0ead71bede254b97b217a2a28f3c166cb4b3f52e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/build/config.mk b/tools/build/config.mk
index 2026ac5..3ef7d99 100644
--- a/tools/build/config.mk
+++ b/tools/build/config.mk
@@ -26,10 +26,13 @@
art \
bluetooth \
cellbroadcast \
+ configinfrastructure \
conscrypt \
+ cronet \
dnsresolver \
documentsui \
extservices \
+ healthfitness \
ipsec \
mainline-infra \
media \
@@ -38,6 +41,7 @@
neuralnetworks \
ondevicepersonalization \
permission \
+ rkpd \
scheduling \
sdkextensions \
statsd \
diff --git a/tools/mts-tradefed/Android.bp b/tools/mts-tradefed/Android.bp
index 1c20ad5..1eeebda 100644
--- a/tools/mts-tradefed/Android.bp
+++ b/tools/mts-tradefed/Android.bp
@@ -22,7 +22,7 @@
wrapper: "etc/mts-tradefed",
short_name: "MTS",
full_name: "Mainline Test Suite",
- version: "3.0",
+ version: "4.0",
static_libs: ["cts-tradefed-harness"],
java_resource_dirs: ["res"],
}
diff --git a/tools/mts-tradefed/etc/mts-tradefed b/tools/mts-tradefed/etc/mts-tradefed
index 76acdaf..a3f7070 100755
--- a/tools/mts-tradefed/etc/mts-tradefed
+++ b/tools/mts-tradefed/etc/mts-tradefed
@@ -109,9 +109,17 @@
# include any host-side test jars
for j in $(find ${MTS_ROOT}/android-mts/testcases -name '*.jar'); do
- JAR_PATH=${JAR_PATH}:$j
+ case "$j" in
+ *testcases/art*)
+ /bin/true
+ ;;
+ *)
+ JAR_PATH=${JAR_PATH}:$j
+ ;;
+ esac
done
+echo "java $RDBG_FLAG -cp ${JAR_PATH} -DMTS_ROOT=${MTS_ROOT} com.android.compatibility.common.tradefed.command.CompatibilityConsole "$@""
java $RDBG_FLAG -cp ${JAR_PATH} -DMTS_ROOT=${MTS_ROOT} com.android.compatibility.common.tradefed.command.CompatibilityConsole "$@"
diff --git a/tools/mts-tradefed/res/config/OWNERS b/tools/mts-tradefed/res/config/OWNERS
index 67dbaee..a3221a0 100644
--- a/tools/mts-tradefed/res/config/OWNERS
+++ b/tools/mts-tradefed/res/config/OWNERS
@@ -1,4 +1,6 @@
per-file mts-art*.xml = rpl@google.com
per-file mts-sdkextensions*.xml = file: platform/packages/modules/SdkExtensions:/OWNERS
per-file mts-bluetooth*.xml = file: platform/packages/modules/Bluetooth/:/pandora/OWNERS
+per-file mts-media*.xml = file: platform/frameworks/av/:/media/janitors/reliability_mainline_OWNERS
+per-file mts-rkpd*.xml = file: platform/packages/modules/RemoteKeyProvisioning:/OWNERS
per-file mts-ondevicepersonalization*.xml = file: platform/packages/modules/OnDevicePersonalization:/OWNERS
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml
index eeeb56c..f7abaa3 100644
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml
@@ -39,11 +39,13 @@
<option name="compatibility:include-filter" value="art-run-test-020-string"/>
<option name="compatibility:include-filter" value="art-run-test-021-string2"/>
<option name="compatibility:include-filter" value="art-run-test-022-interface"/>
+ <option name="compatibility:include-filter" value="art-run-test-024-illegal-access"/>
<option name="compatibility:include-filter" value="art-run-test-025-access-controller"/>
<option name="compatibility:include-filter" value="art-run-test-026-access"/>
<option name="compatibility:include-filter" value="art-run-test-027-arithmetic"/>
<option name="compatibility:include-filter" value="art-run-test-028-array-write"/>
<option name="compatibility:include-filter" value="art-run-test-029-assert"/>
+ <option name="compatibility:include-filter" value="art-run-test-032-concrete-sub"/>
<option name="compatibility:include-filter" value="art-run-test-033-class-init-deadlock"/>
<option name="compatibility:include-filter" value="art-run-test-035-enum"/>
<option name="compatibility:include-filter" value="art-run-test-036-finalizer"/>
@@ -51,6 +53,7 @@
<option name="compatibility:include-filter" value="art-run-test-039-join-main"/>
<option name="compatibility:include-filter" value="art-run-test-040-miranda"/>
<option name="compatibility:include-filter" value="art-run-test-041-narrowing"/>
+ <option name="compatibility:include-filter" value="art-run-test-042-new-instance"/>
<option name="compatibility:include-filter" value="art-run-test-043-privates"/>
<option name="compatibility:include-filter" value="art-run-test-045-reflect-array"/>
<option name="compatibility:include-filter" value="art-run-test-046-reflect"/>
@@ -67,11 +70,15 @@
<option name="compatibility:include-filter" value="art-run-test-062-character-encodings"/>
<option name="compatibility:include-filter" value="art-run-test-063-process-manager"/>
<option name="compatibility:include-filter" value="art-run-test-067-preemptive-unpark"/>
+ <option name="compatibility:include-filter" value="art-run-test-069-field-type"/>
<option name="compatibility:include-filter" value="art-run-test-070-nio-buffer"/>
<option name="compatibility:include-filter" value="art-run-test-072-precise-gc"/>
<option name="compatibility:include-filter" value="art-run-test-072-reachability-fence"/>
+ <option name="compatibility:include-filter" value="art-run-test-073-mismatched-field"/>
<option name="compatibility:include-filter" value="art-run-test-074-gc-thrash"/>
+ <option name="compatibility:include-filter" value="art-run-test-075-verification-error"/>
<option name="compatibility:include-filter" value="art-run-test-076-boolean-put"/>
+ <option name="compatibility:include-filter" value="art-run-test-077-method-override"/>
<option name="compatibility:include-filter" value="art-run-test-078-polymorphic-virtual"/>
<option name="compatibility:include-filter" value="art-run-test-079-phantom"/>
<option name="compatibility:include-filter" value="art-run-test-080-oom-fragmentation"/>
@@ -117,9 +124,7 @@
<option name="compatibility:include-filter" value="art-run-test-140-dce-regression"/>
<option name="compatibility:include-filter" value="art-run-test-140-field-packing"/>
<option name="compatibility:include-filter" value="art-run-test-143-string-value"/>
- <option name="compatibility:include-filter" value="art-run-test-144-static-field-sigquit"/>
<option name="compatibility:include-filter" value="art-run-test-145-alloc-tracking-stress"/>
- <option name="compatibility:include-filter" value="art-run-test-151-OpenFileLimit"/>
<option name="compatibility:include-filter" value="art-run-test-152-dead-large-object"/>
<option name="compatibility:include-filter" value="art-run-test-153-reference-stress"/>
<option name="compatibility:include-filter" value="art-run-test-156-register-dex-file-multi-loader"/>
@@ -132,6 +137,7 @@
<option name="compatibility:include-filter" value="art-run-test-174-escaping-instance-of-bad-class"/>
<option name="compatibility:include-filter" value="art-run-test-175-alloc-big-bignums"/>
<option name="compatibility:include-filter" value="art-run-test-176-app-image-string"/>
+ <option name="compatibility:include-filter" value="art-run-test-182-method-linking"/>
<option name="compatibility:include-filter" value="art-run-test-1960-checker-bounds-codegen"/>
<option name="compatibility:include-filter" value="art-run-test-1961-checker-loop-vectorizer"/>
<option name="compatibility:include-filter" value="art-run-test-201-built-in-except-detail-messages"/>
@@ -149,10 +155,27 @@
<option name="compatibility:include-filter" value="art-run-test-2029-contended-monitors"/>
<option name="compatibility:include-filter" value="art-run-test-2030-long-running-child"/>
<option name="compatibility:include-filter" value="art-run-test-2042-checker-dce-always-throw"/>
+ <option name="compatibility:include-filter" value="art-run-test-2042-reference-processing"/>
+ <option name="compatibility:include-filter" value="art-run-test-2043-reference-pauses"/>
+ <option name="compatibility:include-filter" value="art-run-test-2044-get-stack-traces"/>
<option name="compatibility:include-filter" value="art-run-test-2231-checker-heap-poisoning"/>
- <option name="compatibility:include-filter" value="art-run-test-2232-write-metrics-to-log"/>
+ <option name="compatibility:include-filter" value="art-run-test-2233-checker-remove-loop-suspend-check"/>
<option name="compatibility:include-filter" value="art-run-test-2234-checker-remove-entry-suspendcheck"/>
<option name="compatibility:include-filter" value="art-run-test-2236-JdkUnsafeGetLong-regression"/>
+ <option name="compatibility:include-filter" value="art-run-test-2241-checker-inline-try-catch"/>
+ <option name="compatibility:include-filter" value="art-run-test-2242-checker-lse-acquire-release-operations"/>
+ <option name="compatibility:include-filter" value="art-run-test-2243-checker-not-inline-into-throw"/>
+ <option name="compatibility:include-filter" value="art-run-test-2244-checker-remove-try-boundary"/>
+ <option name="compatibility:include-filter" value="art-run-test-2247-checker-write-barrier-elimination"/>
+ <option name="compatibility:include-filter" value="art-run-test-2249-checker-return-try-boundary-exit-in-loop"/>
+ <option name="compatibility:include-filter" value="art-run-test-2250-inline-throw-into-try"/>
+ <option name="compatibility:include-filter" value="art-run-test-2252-rem-optimization-dividend-divisor"/>
+ <option name="compatibility:include-filter" value="art-run-test-2253-checker-devirtualize-always-throws"/>
+ <option name="compatibility:include-filter" value="art-run-test-2254-checker-not-var-analyzed-pathological"/>
+ <option name="compatibility:include-filter" value="art-run-test-2254-class-value-before-and-after-u"/>
+ <option name="compatibility:include-filter" value="art-run-test-2255-checker-branch-redirection"/>
+ <option name="compatibility:include-filter" value="art-run-test-2256-checker-vector-replacement"/>
+ <option name="compatibility:include-filter" value="art-run-test-2257-checker-constant-folding-before-codegen"/>
<option name="compatibility:include-filter" value="art-run-test-300-package-override"/>
<option name="compatibility:include-filter" value="art-run-test-301-abstract-protected"/>
<option name="compatibility:include-filter" value="art-run-test-302-float-conversion"/>
@@ -282,7 +305,9 @@
<option name="compatibility:include-filter" value="art-run-test-534-checker-bce-deoptimization"/>
<option name="compatibility:include-filter" value="art-run-test-535-deopt-and-inlining"/>
<option name="compatibility:include-filter" value="art-run-test-536-checker-intrinsic-optimization"/>
+ <option name="compatibility:include-filter" value="art-run-test-536-checker-needs-access-check"/>
<option name="compatibility:include-filter" value="art-run-test-537-checker-arraycopy"/>
+ <option name="compatibility:include-filter" value="art-run-test-537-checker-inline-and-unverified"/>
<option name="compatibility:include-filter" value="art-run-test-537-checker-jump-over-jump"/>
<option name="compatibility:include-filter" value="art-run-test-538-checker-embed-constants"/>
<option name="compatibility:include-filter" value="art-run-test-540-checker-rtp-bug"/>
@@ -382,6 +407,7 @@
<option name="compatibility:include-filter" value="art-run-test-660-checker-simd-sad"/>
<option name="compatibility:include-filter" value="art-run-test-661-checker-simd-reduc"/>
<option name="compatibility:include-filter" value="art-run-test-662-regression-alias"/>
+ <option name="compatibility:include-filter" value="art-run-test-663-checker-select-generator"/>
<option name="compatibility:include-filter" value="art-run-test-665-checker-simd-zero"/>
<option name="compatibility:include-filter" value="art-run-test-666-dex-cache-itf"/>
<option name="compatibility:include-filter" value="art-run-test-667-checker-simd-alignment"/>
@@ -423,7 +449,13 @@
<option name="compatibility:include-filter" value="art-run-test-828-partial-lse"/>
<option name="compatibility:include-filter" value="art-run-test-834-lse"/>
<option name="compatibility:include-filter" value="art-run-test-835-b216762268"/>
+ <option name="compatibility:include-filter" value="art-run-test-838-override"/>
+ <option name="compatibility:include-filter" value="art-run-test-839-clinit-throw"/>
+ <option name="compatibility:include-filter" value="art-run-test-841-defaults"/>
+ <option name="compatibility:include-filter" value="art-run-test-843-default-interface"/>
<option name="compatibility:include-filter" value="art-run-test-963-default-range-smali"/>
+ <option name="compatibility:include-filter" value="art-run-test-965-default-verify"/>
+ <option name="compatibility:include-filter" value="art-run-test-967-default-ame"/>
<!-- Enable MainlineTestModuleController for ART run-tests. -->
<!-- TODO(rpl): Find a way to express this list in a more concise fashion. -->
<option name="compatibility:module-arg" value="art-run-test-001-HelloWorld:enable:true"/>
@@ -448,11 +480,13 @@
<option name="compatibility:module-arg" value="art-run-test-020-string:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-021-string2:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-022-interface:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-024-illegal-access:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-025-access-controller:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-026-access:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-027-arithmetic:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-028-array-write:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-029-assert:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-032-concrete-sub:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-033-class-init-deadlock:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-035-enum:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-036-finalizer:enable:true"/>
@@ -460,6 +494,7 @@
<option name="compatibility:module-arg" value="art-run-test-039-join-main:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-040-miranda:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-041-narrowing:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-042-new-instance:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-043-privates:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-045-reflect-array:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-046-reflect:enable:true"/>
@@ -476,11 +511,15 @@
<option name="compatibility:module-arg" value="art-run-test-062-character-encodings:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-063-process-manager:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-067-preemptive-unpark:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-069-field-type:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-070-nio-buffer:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-072-precise-gc:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-072-reachability-fence:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-073-mismatched-field:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-074-gc-thrash:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-075-verification-error:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-076-boolean-put:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-077-method-override:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-078-polymorphic-virtual:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-079-phantom:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-080-oom-fragmentation:enable:true"/>
@@ -526,9 +565,7 @@
<option name="compatibility:module-arg" value="art-run-test-140-dce-regression:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-140-field-packing:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-143-string-value:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-144-static-field-sigquit:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-145-alloc-tracking-stress:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-151-OpenFileLimit:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-152-dead-large-object:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-153-reference-stress:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-156-register-dex-file-multi-loader:enable:true"/>
@@ -541,6 +578,7 @@
<option name="compatibility:module-arg" value="art-run-test-174-escaping-instance-of-bad-class:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-175-alloc-big-bignums:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-176-app-image-string:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-182-method-linking:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-1960-checker-bounds-codegen:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-1961-checker-loop-vectorizer:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-201-built-in-except-detail-messages:enable:true"/>
@@ -558,10 +596,27 @@
<option name="compatibility:module-arg" value="art-run-test-2029-contended-monitors:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-2030-long-running-child:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-2042-checker-dce-always-throw:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2042-reference-processing:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2043-reference-pauses:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2044-get-stack-traces:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-2231-checker-heap-poisoning:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-2232-write-metrics-to-log:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2233-checker-remove-loop-suspend-check:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-2234-checker-remove-entry-suspendcheck:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-2236-JdkUnsafeGetLong-regression:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2241-checker-inline-try-catch:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2242-checker-lse-acquire-release-operations:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2243-checker-not-inline-into-throw:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2244-checker-remove-try-boundary:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2247-checker-write-barrier-elimination:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2249-checker-return-try-boundary-exit-in-loop:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2250-inline-throw-into-try:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2252-rem-optimization-dividend-divisor:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2253-checker-devirtualize-always-throws:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2254-checker-not-var-analyzed-pathological:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2254-class-value-before-and-after-u:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2255-checker-branch-redirection:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2256-checker-vector-replacement:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-2257-checker-constant-folding-before-codegen:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-300-package-override:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-301-abstract-protected:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-302-float-conversion:enable:true"/>
@@ -691,7 +746,9 @@
<option name="compatibility:module-arg" value="art-run-test-534-checker-bce-deoptimization:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-535-deopt-and-inlining:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-536-checker-intrinsic-optimization:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-536-checker-needs-access-check:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-537-checker-arraycopy:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-537-checker-inline-and-unverified:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-537-checker-jump-over-jump:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-538-checker-embed-constants:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-540-checker-rtp-bug:enable:true"/>
@@ -791,6 +848,7 @@
<option name="compatibility:module-arg" value="art-run-test-660-checker-simd-sad:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-661-checker-simd-reduc:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-662-regression-alias:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-663-checker-select-generator:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-665-checker-simd-zero:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-666-dex-cache-itf:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-667-checker-simd-alignment:enable:true"/>
@@ -832,5 +890,11 @@
<option name="compatibility:module-arg" value="art-run-test-828-partial-lse:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-834-lse:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-835-b216762268:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-838-override:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-839-clinit-throw:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-841-defaults:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-843-default-interface:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-963-default-range-smali:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-965-default-verify:enable:true"/>
+ <option name="compatibility:module-arg" value="art-run-test-967-default-ame:enable:true"/>
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-03.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-03.xml
index 58fbe71..e83e4e9 100644
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-03.xml
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-03.xml
@@ -17,12 +17,11 @@
<configuration description="List of ART MTS tests that do not need root access (shard 03)">
<!-- ART gtests. -->
<option name="compatibility:include-filter" value="art_libnativebridge_cts_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_artd_tests"/>
<option name="compatibility:include-filter" value="art_standalone_cmdline_tests"/>
<option name="compatibility:include-filter" value="art_standalone_compiler_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_dex2oat_tests"/>
<option name="compatibility:include-filter" value="art_standalone_dexdump_tests"/>
<option name="compatibility:include-filter" value="art_standalone_dexlist_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_libartbase_tests"/>
<option name="compatibility:include-filter" value="art_standalone_libartpalette_tests"/>
<option name="compatibility:include-filter" value="art_standalone_libartservice_tests"/>
<option name="compatibility:include-filter" value="art_standalone_libarttools_tests"/>
@@ -30,18 +29,17 @@
<option name="compatibility:include-filter" value="art_standalone_libdexfile_tests"/>
<option name="compatibility:include-filter" value="art_standalone_libprofile_tests"/>
<option name="compatibility:include-filter" value="art_standalone_oatdump_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_runtime_compiler_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_odrefresh_tests"/>
<option name="compatibility:include-filter" value="art_standalone_runtime_tests"/>
<option name="compatibility:include-filter" value="art_standalone_sigchain_tests"/>
<option name="compatibility:include-filter" value="libnativeloader_test"/>
<!-- Enable MainlineTestModuleController for ART gtests. -->
<option name="compatibility:module-arg" value="art_libnativebridge_cts_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_artd_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_cmdline_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_compiler_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_dex2oat_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_dexdump_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_dexlist_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_libartbase_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_libartpalette_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_libartservice_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_libarttools_tests:enable:true"/>
@@ -49,7 +47,7 @@
<option name="compatibility:module-arg" value="art_standalone_libdexfile_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_libprofile_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_oatdump_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_runtime_compiler_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_odrefresh_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_runtime_tests:enable:true"/>
<option name="compatibility:module-arg" value="art_standalone_sigchain_tests:enable:true"/>
<option name="compatibility:module-arg" value="libnativeloader_test:enable:true"/>
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
index 7fda924..8c2b25c 100644
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
@@ -37,4 +37,5 @@
<option name="compatibility:exclude-filter" value="CtsLibcoreTestCases libcore.dalvik.system.DelegateLastClassLoaderTest#testLookupOrder_getResource"/>
<!-- Excluded failing tests (b/247108425). -->
<option name="compatibility:exclude-filter" value="art_standalone_compiler_tests JniCompilerTest*"/>
+ <option name="compatibility:exclude-filter" value="art_standalone_libartpalette_tests PaletteClientJniTest*"/>
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-shard-00.xml b/tools/mts-tradefed/res/config/mts-bluetooth-shard-00.xml
index 40e4099..a80b99b 100644
--- a/tools/mts-tradefed/res/config/mts-bluetooth-shard-00.xml
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-shard-00.xml
@@ -24,4 +24,6 @@
<option name="expected-value" value="userdebug"/> <!-- Device should have userdebug/eng build -->
<option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
</target_preparer>
+
+ <option name="compatibility:primary-abi-only" value="true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-shard-01.xml b/tools/mts-tradefed/res/config/mts-bluetooth-shard-01.xml
index 3cb28b3..4949def 100644
--- a/tools/mts-tradefed/res/config/mts-bluetooth-shard-01.xml
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-shard-01.xml
@@ -24,4 +24,6 @@
<option name="expected-value" value="userdebug"/> <!-- Device should have userdebug/eng build -->
<option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
</target_preparer>
+
+ <option name="compatibility:primary-abi-only" value="true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-shard-02.xml b/tools/mts-tradefed/res/config/mts-bluetooth-shard-02.xml
index ebcef27..b595c20 100644
--- a/tools/mts-tradefed/res/config/mts-bluetooth-shard-02.xml
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-shard-02.xml
@@ -24,4 +24,6 @@
<option name="expected-value" value="userdebug"/> <!-- Device should have userdebug/eng build -->
<option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
</target_preparer>
+
+ <option name="compatibility:primary-abi-only" value="true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-01.xml b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-01.xml
index 70c1191..843dbd3 100644
--- a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-01.xml
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-01.xml
@@ -15,8 +15,8 @@
-->
<configuration description="List of Bluetooth MTS tests that do not need root access (shard 01).">
<option name="compatibility:include-filter" value="CtsBluetoothTestCases" />
- <option name="compatibility:include-filter" value="GoogleFrameworkBluetoothTests" />
- <option name="compatibility:include-filter" value="GoogleServiceBluetoothTests" />
+ <option name="compatibility:include-filter" value="FrameworkBluetoothTests" />
+ <option name="compatibility:include-filter" value="ServiceBluetoothTests" />
<option name="compatibility:include-filter" value="GoogleBluetoothInstrumentationTests" />
<option name="compatibility:module-arg" value="CtsBluetoothTestCases:enable:true" />
<option name="compatibility:module-arg" value="FrameworkBluetoothTests:enable:true" />
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-02.xml b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-02.xml
index dea847d..60eb791 100644
--- a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-02.xml
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-02.xml
@@ -14,114 +14,116 @@
limitations under the License.
-->
<configuration description="List of Bluetooth MTS tests that do not need root access (shard 02).">
+ <option name="compatibility:include-filter" value="bluetooth_csis_test" />
+ <option name="compatibility:include-filter" value="bluetooth_flatbuffer_tests" />
+ <option name="compatibility:include-filter" value="bluetooth_groups_test" />
+ <option name="compatibility:include-filter" value="bluetooth_has_test" />
+ <option name="compatibility:include-filter" value="bluetooth_le_audio_client_test" />
+ <option name="compatibility:include-filter" value="bluetooth_le_audio_test" />
+ <option name="compatibility:include-filter" value="bluetooth_packet_parser_test" />
+ <option name="compatibility:include-filter" value="bluetoothtbd_test" />
+ <option name="compatibility:include-filter" value="bluetooth_test_broadcaster" />
+ <option name="compatibility:include-filter" value="bluetooth_test_common" />
+ <option name="compatibility:include-filter" value="bluetooth_test_gd_unit" />
+ <option name="compatibility:include-filter" value="bluetooth_test_sdp" />
+ <option name="compatibility:include-filter" value="bluetooth_vc_test" />
+ <option name="compatibility:include-filter" value="bt_host_test_bta" />
+ <option name="compatibility:include-filter" value="libaptx_enc_tests" />
+ <option name="compatibility:include-filter" value="libaptxhd_enc_tests" />
<option name="compatibility:include-filter" value="net_test_audio_a2dp_hw" />
<option name="compatibility:include-filter" value="net_test_audio_hearing_aid_hw" />
+ <option name="compatibility:include-filter" value="net_test_avrcp" />
+ <option name="compatibility:include-filter" value="net_test_bluetooth" />
<option name="compatibility:include-filter" value="net_test_bta" />
- <option name="compatibility:include-filter" value="bt_host_test_bta" />
- <option name="compatibility:include-filter" value="net_test_hf_client_add_record" />
- <option name="compatibility:include-filter" value="bluetooth_csis_test" />
- <option name="compatibility:include-filter" value="bluetooth_groups_test" />
- <option name="compatibility:include-filter" value="bluetooth_vc_test" />
- <option name="compatibility:include-filter" value="bluetooth_le_audio_test" />
- <option name="compatibility:include-filter" value="bluetooth_le_audio_client_test" />
- <option name="compatibility:include-filter" value="bluetooth_test_broadcaster" />
- <option name="compatibility:include-filter" value="bluetooth_has_test" />
<option name="compatibility:include-filter" value="net_test_btcore" />
<option name="compatibility:include-filter" value="net_test_btif" />
- <option name="compatibility:include-filter" value="net_test_btif_profile_queue" />
- <option name="compatibility:include-filter" value="net_test_btif_rc" />
<option name="compatibility:include-filter" value="net_test_btif_config_cache" />
<option name="compatibility:include-filter" value="net_test_btif_hf_client_service" />
+ <option name="compatibility:include-filter" value="net_test_btif_profile_queue" />
+ <option name="compatibility:include-filter" value="net_test_btif_rc" />
<option name="compatibility:include-filter" value="net_test_btif_stack" />
- <option name="compatibility:include-filter" value="bluetooth_test_common" />
- <option name="compatibility:include-filter" value="net_test_performance" />
+ <option name="compatibility:include-filter" value="net_test_btm_iso" />
+ <option name="compatibility:include-filter" value="net_test_btpackets" />
<option name="compatibility:include-filter" value="net_test_device" />
- <option name="compatibility:include-filter" value="bluetooth_test_gd_unit" />
- <option name="compatibility:include-filter" value="bluetooth_packet_parser_test" />
- <option name="compatibility:include-filter" value="bluetooth_flatbuffer_tests" />
+ <option name="compatibility:include-filter" value="net_test_eatt" />
<option name="compatibility:include-filter" value="net_test_hci" />
<option name="compatibility:include-filter" value="net_test_hci_fragmenter_native" />
<option name="compatibility:include-filter" value="net_test_main_shim" />
<option name="compatibility:include-filter" value="net_test_osi" />
- <option name="compatibility:include-filter" value="net_test_btpackets" />
- <option name="compatibility:include-filter" value="net_test_avrcp" />
- <option name="compatibility:include-filter" value="bluetooth_test_sdp" />
- <option name="compatibility:include-filter" value="bluetoothtbd_test" />
+ <option name="compatibility:include-filter" value="net_test_performance" />
<option name="compatibility:include-filter" value="net_test_stack" />
- <option name="compatibility:include-filter" value="net_test_stack_rfcomm" />
- <option name="compatibility:include-filter" value="net_test_stack_smp" />
- <option name="compatibility:include-filter" value="net_test_stack_multi_adv" />
- <option name="compatibility:include-filter" value="net_test_stack_ad_parser" />
- <option name="compatibility:include-filter" value="net_test_stack_gatt_native" />
- <option name="compatibility:include-filter" value="net_test_stack_avdtp" />
<option name="compatibility:include-filter" value="net_test_stack_a2dp_codecs_native" />
<option name="compatibility:include-filter" value="net_test_stack_a2dp_native" />
- <option name="compatibility:include-filter" value="net_test_stack_gatt_sr_hash_native" />
- <option name="compatibility:include-filter" value="net_test_btm_iso" />
- <option name="compatibility:include-filter" value="net_test_eatt" />
+ <option name="compatibility:include-filter" value="net_test_stack_acl" />
+ <option name="compatibility:include-filter" value="net_test_stack_ad_parser" />
+ <option name="compatibility:include-filter" value="net_test_stack_avdtp" />
<option name="compatibility:include-filter" value="net_test_stack_btm" />
- <option name="compatibility:include-filter" value="net_test_stack_hci" />
- <option name="compatibility:include-filter" value="net_test_stack_hid" />
<option name="compatibility:include-filter" value="net_test_stack_btu" />
<option name="compatibility:include-filter" value="net_test_stack_gatt" />
+ <option name="compatibility:include-filter" value="net_test_stack_gatt_native" />
+ <option name="compatibility:include-filter" value="net_test_stack_gatt_sr_hash_native" />
+ <option name="compatibility:include-filter" value="net_test_stack_hci" />
+ <option name="compatibility:include-filter" value="net_test_stack_hid" />
<option name="compatibility:include-filter" value="net_test_stack_l2cap" />
- <option name="compatibility:include-filter" value="net_test_stack_acl" />
+ <option name="compatibility:include-filter" value="net_test_stack_multi_adv" />
+ <option name="compatibility:include-filter" value="net_test_stack_rfcomm" />
<option name="compatibility:include-filter" value="net_test_stack_sdp" />
- <option name="compatibility:include-filter" value="net_test_bluetooth" />
+ <option name="compatibility:include-filter" value="net_test_stack_smp" />
<option name="compatibility:include-filter" value="net_test_types" />
+ <option name="compatibility:module-arg" value="bluetooth_csis_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_flatbuffer_tests:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_groups_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_has_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_le_audio_client_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_le_audio_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_packet_parser_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetoothtbd_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_test_broadcaster:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_test_common:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_test_gd_unit:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_test_sdp:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_vc_test:enable:true" />
+ <option name="compatibility:module-arg" value="bt_host_test_bta:enable:true" />
+ <option name="compatibility:module-arg" value="libaptx_enc_tests:enable:true" />
+ <option name="compatibility:module-arg" value="libaptxhd_enc_tests:enable:true" />
<option name="compatibility:module-arg" value="net_test_audio_a2dp_hw:enable:true" />
<option name="compatibility:module-arg" value="net_test_audio_hearing_aid_hw:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_avrcp:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_bluetooth:enable:true" />
<option name="compatibility:module-arg" value="net_test_bta:enable:true" />
- <option name="compatibility:module-arg" value="bt_host_test_bta:enable:true" />
- <option name="compatibility:module-arg" value="net_test_hf_client_add_record:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_csis_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_groups_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_vc_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_le_audio_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_le_audio_client_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_test_broadcaster:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_has_test:enable:true" />
<option name="compatibility:module-arg" value="net_test_btcore:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btif_config_cache:enable:true" />
<option name="compatibility:module-arg" value="net_test_btif:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btif_hf_client_service:enable:true" />
<option name="compatibility:module-arg" value="net_test_btif_profile_queue:enable:true" />
<option name="compatibility:module-arg" value="net_test_btif_rc:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btif_config_cache:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btif_hf_client_service:enable:true" />
<option name="compatibility:module-arg" value="net_test_btif_stack:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_test_common:enable:true" />
- <option name="compatibility:module-arg" value="net_test_performance:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btm_iso:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btpackets:enable:true" />
<option name="compatibility:module-arg" value="net_test_device:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_test_gd_unit:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_packet_parser_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_flatbuffer_tests:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_eatt:enable:true" />
<option name="compatibility:module-arg" value="net_test_hci:enable:true" />
<option name="compatibility:module-arg" value="net_test_hci_fragmenter_native:enable:true" />
<option name="compatibility:module-arg" value="net_test_main_shim:enable:true" />
<option name="compatibility:module-arg" value="net_test_osi:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btpackets:enable:true" />
- <option name="compatibility:module-arg" value="net_test_avrcp:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_test_sdp:enable:true" />
- <option name="compatibility:module-arg" value="bluetoothtbd_test:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_rfcomm:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_smp:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_multi_adv:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_ad_parser:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_gatt_native:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_avdtp:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_performance:enable:true" />
<option name="compatibility:module-arg" value="net_test_stack_a2dp_codecs_native:enable:true" />
<option name="compatibility:module-arg" value="net_test_stack_a2dp_native:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_gatt_sr_hash_native:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btm_iso:enable:true" />
- <option name="compatibility:module-arg" value="net_test_eatt:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_acl:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_ad_parser:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_avdtp:enable:true" />
<option name="compatibility:module-arg" value="net_test_stack_btm:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_btu:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_gatt:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_gatt_native:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_gatt_sr_hash_native:enable:true" />
<option name="compatibility:module-arg" value="net_test_stack_hci:enable:true" />
<option name="compatibility:module-arg" value="net_test_stack_hid:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_btu:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_gatt:enable:true" />
<option name="compatibility:module-arg" value="net_test_stack_l2cap:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_acl:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_multi_adv:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_rfcomm:enable:true" />
<option name="compatibility:module-arg" value="net_test_stack_sdp:enable:true" />
- <option name="compatibility:module-arg" value="net_test_bluetooth:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_smp:enable:true" />
<option name="compatibility:module-arg" value="net_test_types:enable:true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-configinfrastructure-tests-list.xml b/tools/mts-tradefed/res/config/mts-configinfrastructure-tests-list.xml
new file mode 100644
index 0000000..321883f
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-configinfrastructure-tests-list.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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="List MTS configinfrastructure tests.">
+ <option name="compatibility:include-filter" value="CtsDeviceConfigTestCases" />
+
+ <!-- Enable MainlineTestModuleController. -->
+ <option name="compatibility:module-arg" value="CtsDeviceConfigTestCases:enable:true" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-configinfrastructure.xml b/tools/mts-tradefed/res/config/mts-configinfrastructure.xml
new file mode 100644
index 0000000..5f82759
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-configinfrastructure.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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 MTS-configinfrastructure from a pre-existing MTS installation">
+
+ <include name="mts" />
+
+ <include name="mts-configinfrastructure-tests-list" />
+
+ <option name="plan" value="mts-configinfrastructure" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-cronet.xml b/tools/mts-tradefed/res/config/mts-cronet.xml
new file mode 100644
index 0000000..0b6425e
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-cronet.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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 MTS-cronet from a pre-existing MTS installation">
+
+ <include name="mts" />
+
+ <option name="plan" value="mts-cronet" />
+
+ <option name="compatibility:include-filter" value="CtsCronetTestCases" />
+
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-exclude.xml b/tools/mts-tradefed/res/config/mts-exclude.xml
index 8613777..a33609c 100644
--- a/tools/mts-tradefed/res/config/mts-exclude.xml
+++ b/tools/mts-tradefed/res/config/mts-exclude.xml
@@ -90,10 +90,14 @@
<!-- b/234821097: Flaky test due to hardware and test setup, not related to the module-->
<option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTest11mcApUsingResponderConfig" />
<option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTest11mcApUsingScanResult" />
+ <option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTest11mcApUsingListResponderConfig" />
<option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTestNon11mcApUsingResponderConfig" />
<option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTestNon11mcApUsingScanResult" />
<!-- TODO(b/153088610): Missing AP support in test lab -->
<option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.rtt.cts.WifiRttTest#testRangingToTestApWithResponderLocation" />
+ <!-- Exclude the sharedconnectivity from CtsWifiTestCases as it's not related to Wifi APIs -->
+ <option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.sharedconnectivity.cts" />
+ <option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.sharedconnectivity.cts.app" />
<!--Tests in CtsAppSecurityHostTestCases that are not testing mainline modules-->
<option name="compatibility:exclude-filter" value="CtsAppSecurityHostTestCases android.appsecurity.cts.AccessSerialNumberTest" />
@@ -263,6 +267,10 @@
<option name="compatibility:exclude-filter" value="MtsConscryptTestCases org.apache.harmony.tests.javax.net.ssl.HostnameVerifierTest#testVerify" />
<option name="compatibility:exclude-filter" value="MtsConscryptFdSocketTestCases org.apache.harmony.tests.javax.net.ssl.HostnameVerifierTest#testVerify" />
+ <!-- b/278930042: Test depends on a change not available on older branches -->
+ <option name="compatibility:exclude-filter" value="MtsConscryptTestCases com.android.org.conscrypt.javax.crypto.CipherTest#test_PBKDF2WITHHMACSHA1_SKFactory_and_PBEAESCBC_Cipher_noIV" />
+ <option name="compatibility:exclude-filter" value="MtsConscryptFdSocketTestCases com.android.org.conscrypt.javax.crypto.CipherTest#test_PBKDF2WITHHMACSHA1_SKFactory_and_PBEAESCBC_Cipher_noIV" />
+
<!-- Exclude tests that are not related to TextClassifierService mainline. -->
<option name="compatibility:exclude-filter" value="CtsTextClassifierTestCases android.view.textclassifier.cts.ConversationActionsTest" />
<option name="compatibility:exclude-filter" value="CtsTextClassifierTestCases android.view.textclassifier.cts.ConversationActionTest" />
diff --git a/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml b/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml
index 72fc9f3..3e18a55 100644
--- a/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml
@@ -72,6 +72,7 @@
<option name="compatibility:module-arg" value="libtextclassifier_tests:enable:true" />
<option name="compatibility:module-arg" value="libtextclassifier_java_tests:enable:true" />
<option name="compatibility:module-arg" value="libextservices_test:enable:true" />
+ <option name="compatibility:module-arg" value="CtsHealthFitnessDeviceTestCases:enable:true" />
<option name="compatibility:module-arg" value="AdExtServicesApkUINotificationTests:enable:true" />
<option name="compatibility:module-arg" value="AdExtServicesApkUISettingsGaOtaTests:enable:true" />
diff --git a/tools/mts-tradefed/res/config/mts-healthfitness-tests-list.xml b/tools/mts-tradefed/res/config/mts-healthfitness-tests-list.xml
new file mode 100644
index 0000000..7ac75ed
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-healthfitness-tests-list.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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="List test modules of HealthFitness module. This is a placeholder xml instead of a runnable plan.">
+ <option name="compatibility:include-filter" value="CtsHealthFitnessDeviceTestCases" />
+ <option name="compatibility:include-filter" value="CtsHealthFitnessDeviceTestCasesNoPermission" />
+ <option name="compatibility:include-filter" value="HealthFitnessUnitTests" />
+ <option name="compatibility:include-filter" value="HealthConnectControllerUITests" />
+ <option name="compatibility:include-filter" value="CtsHealthConnectControllerTestCases" />
+ <option name="compatibility:include-filter" value="HealthFitnessIntegrationTests" />
+ <option name="compatibility:include-filter" value="HealthConnectBackupRestoreUnitTests" />
+
+ <option name="compatibility:module-arg" value="CtsHealthFitnessDeviceTestCases:enable:true" />
+ <option name="compatibility:module-arg" value="CtsHealthFitnessDeviceTestCasesNoPermission:enable:true" />
+ <option name="compatibility:module-arg" value="HealthFitnessUnitTests:enable:true" />
+ <option name="compatibility:module-arg" value="HealthConnectControllerUITests:enable:true" />
+ <option name="compatibility:module-arg" value="CtsHealthConnectControllerTestCases:enable:true" />
+ <option name="compatibility:module-arg" value="HealthFitnessIntegrationTests:enable:true" />
+ <option name="compatibility:module-arg" value="HealthConnectBackupRestoreUnitTests:enable:true" />
+
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-healthfitness.xml b/tools/mts-tradefed/res/config/mts-healthfitness.xml
new file mode 100644
index 0000000..6a142b2
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-healthfitness.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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 MTS-healthfitness from a pre-existing MTS installation">
+ <include name="mts" />
+
+ <include name="mts-healthfitness-tests-list" />
+
+ <option name="plan" value="mts-healthfitness" />
+</configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-media-tests-list.xml b/tools/mts-tradefed/res/config/mts-media-tests-list.xml
index 16fb98c..260a7c9 100644
--- a/tools/mts-tradefed/res/config/mts-media-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-media-tests-list.xml
@@ -17,43 +17,44 @@
<!-- These Media CTS tests are mostly relevant to mainline.
The "mostly" is addressed with annotations to exclude specific tests in each suite.
-->
+ <option name="compatibility:include-filter" value="CtsMediaBetterTogetherTestCases" />
+ <option name="compatibility:module-arg" value="CtsMediaBetterTogetherTestCases:exclude-annotation:com.android.compatibility.common.util.NonMainlineTest" />
+ <option name="compatibility:module-arg" value="CtsMediaBetterTogetherTestCases:instrumentation-arg:mts-media:=true" />
+
<option name="compatibility:include-filter" value="CtsMediaCodecTestCases" />
- <option name="compatibility:module-arg" value="CtsMediaCodecTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
+ <option name="compatibility:module-arg" value="CtsMediaCodecTestCases:exclude-annotation:com.android.compatibility.common.util.NonMainlineTest" />
<option name="compatibility:module-arg" value="CtsMediaCodecTestCases:instrumentation-arg:mts-media:=true" />
<option name="compatibility:include-filter" value="CtsMediaDecoderTestCases" />
- <option name="compatibility:module-arg" value="CtsMediaDecoderTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
+ <option name="compatibility:module-arg" value="CtsMediaDecoderTestCases:exclude-annotation:com.android.compatibility.common.util.NonMainlineTest" />
<option name="compatibility:module-arg" value="CtsMediaDecoderTestCases:instrumentation-arg:mts-media:=true" />
<option name="compatibility:include-filter" value="CtsMediaEncoderTestCases" />
- <option name="compatibility:module-arg" value="CtsMediaEncoderTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
+ <option name="compatibility:module-arg" value="CtsMediaEncoderTestCases:exclude-annotation:com.android.compatibility.common.util.NonMainlineTest" />
<option name="compatibility:module-arg" value="CtsMediaEncoderTestCases:instrumentation-arg:mts-media:=true" />
<option name="compatibility:include-filter" value="CtsMediaExtractorTestCases" />
- <option name="compatibility:module-arg" value="CtsMediaExtractorTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
+ <option name="compatibility:module-arg" value="CtsMediaExtractorTestCases:exclude-annotation:com.android.compatibility.common.util.NonMainlineTest" />
<option name="compatibility:module-arg" value="CtsMediaExtractorTestCases:instrumentation-arg:mts-media:=true" />
<option name="compatibility:include-filter" value="CtsMediaMiscTestCases" />
- <option name="compatibility:module-arg" value="CtsMediaMiscTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
+ <option name="compatibility:module-arg" value="CtsMediaMiscTestCases:exclude-annotation:com.android.compatibility.common.util.NonMainlineTest" />
<option name="compatibility:module-arg" value="CtsMediaMiscTestCases:instrumentation-arg:mts-media:=true" />
<option name="compatibility:include-filter" value="CtsMediaPlayerTestCases" />
- <option name="compatibility:module-arg" value="CtsMediaPlayerTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
+ <option name="compatibility:module-arg" value="CtsMediaPlayerTestCases:exclude-annotation:com.android.compatibility.common.util.NonMainlineTest" />
<option name="compatibility:module-arg" value="CtsMediaPlayerTestCases:instrumentation-arg:mts-media:=true" />
<option name="compatibility:include-filter" value="CtsMediaV2TestCases" />
- <option name="compatibility:module-arg" value="CtsMediaV2TestCases:exclude-annotation:android.mediav2.cts.NonMediaMainlineTest" />
+ <option name="compatibility:module-arg" value="CtsMediaV2TestCases:exclude-annotation:com.android.compatibility.common.util.NonMainlineTest" />
<option name="compatibility:include-filter" value="CtsMediaParserTestCases" />
<option name="compatibility:include-filter" value="CtsMediaStressTestCases" />
- <option name="compatibility:module-arg" value="CtsMediaStressTestCases:exclude-annotation:android.mediastress.cts.NonMediaMainlineTest" />
+ <option name="compatibility:module-arg" value="CtsMediaStressTestCases:exclude-annotation:com.android.compatibility.common.util.NonMainlineTest" />
<option name="compatibility:include-filter" value="CtsMediaTranscodingTestCases" />
- <!-- unit tests -->
- <option name="compatibility:include-filter" value="Mpeg4H263DecoderTest" />
-
<!--b/138964734-->
<option name="compatibility:exclude-filter" value="CtsMediaCodecTestCases android.media.codec.cts.MediaCodecCapabilitiesTest#testGetMaxSupportedInstances" />
diff --git a/tools/mts-tradefed/res/config/mts-network-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-network-tests-list-eng-only.xml
new file mode 100644
index 0000000..dd45163
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-network-tests-list-eng-only.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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="List of NetworkStack MTS tests that need root access.">
+ <option name="compatibility:include-filter" value="NetworkStackRootTests" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-network-tests-list.xml b/tools/mts-tradefed/res/config/mts-network-tests-list-user.xml
similarity index 100%
rename from tools/mts-tradefed/res/config/mts-network-tests-list.xml
rename to tools/mts-tradefed/res/config/mts-network-tests-list-user.xml
diff --git a/tools/mts-tradefed/res/config/mts-network.xml b/tools/mts-tradefed/res/config/mts-network.xml
index 0d25ecb..2d2aa4c 100644
--- a/tools/mts-tradefed/res/config/mts-network.xml
+++ b/tools/mts-tradefed/res/config/mts-network.xml
@@ -17,7 +17,8 @@
<include name="mts" />
- <include name="mts-network-tests-list" />
+ <include name="mts-network-tests-list-user" />
+ <include name="mts-network-tests-list-eng-only" />
<option name="plan" value="mts-network" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-ondevicepersonalization-tests-list.xml b/tools/mts-tradefed/res/config/mts-ondevicepersonalization-tests-list.xml
index 1c977ae..edf1694 100644
--- a/tools/mts-tradefed/res/config/mts-ondevicepersonalization-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-ondevicepersonalization-tests-list.xml
@@ -13,22 +13,22 @@
<configuration description="List test modules of OnDevicePersonalization module. This is a placeholder xml instead of a runnable plan.">
<option name="compatibility:include-filter"
- value="CtsOnDevicePersonalizationTestCases android.ondevicepersonalization.cts.OnDevicePersonalizationServiceTest" />
- <option name="compatibility:include-filter"
value="FrameworkOnDevicePersonalizationTests" />
<option name="compatibility:include-filter"
value="OnDevicePersonalizationManagingServicesTests" />
<option name="compatibility:include-filter"
value="OnDevicePersonalizationPluginTests" />
<option name="compatibility:include-filter"
+ value="OnDevicePersonalizationSystemServiceImplTests" />
+ <option name="compatibility:include-filter"
value="OdpChronicleTests" />
<option name="compatibility:include-filter"
value="FederatedComputeServicesTests" />
- <option name="compatibility:module-arg" value="CtsOnDevicePersonalizationTestCases:enable:true" />
<option name="compatibility:module-arg" value="FrameworkOnDevicePersonalizationTests:enable:true" />
<option name="compatibility:module-arg" value="OnDevicePersonalizationManagingServicesTests:enable:true" />
<option name="compatibility:module-arg" value="OnDevicePersonalizationPluginTests:enable:true" />
+ <option name="compatibility:module-arg" value="OnDevicePersonalizationSystemServiceImplTests:enable:true" />
<option name="compatibility:module-arg" value="OdpChronicleTests:enable:true" />
<option name="compatibility:module-arg" value="FederatedComputeServicesTests:enable:true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml b/tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml
index 6678ec4..ed9ee41 100644
--- a/tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml
+++ b/tools/mts-tradefed/res/config/mts-permission-tests-list-oem.xml
@@ -25,6 +25,7 @@
<option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.BackgroundPermissionsTest" />
<option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.LocationAccessCheckTest" />
<option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.NotificationListenerCheckTest" />
+ <option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.NotificationListenerCheckWithSafetyCenterUnsupportedTest" />
<option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.OneTimePermissionTest" />
<option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.PermissionControllerTest" />
<option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.PlatformPermissionGroupMappingTest" />
@@ -52,4 +53,10 @@
<option name="compatibility:module-arg" value="SafetyCenterConfigTests:exclude-annotation:android.platform.test.annotations.FlakyTest" />
<option name="compatibility:include-filter" value="GtsPermissionUiTestCases" />
<option name="compatibility:module-arg" value="GtsPermissionUiTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
+ <option name="compatibility:include-filter" value="SafetyCenterFunctionalMultiUsersTestCases" />
+ <option name="compatibility:module-arg" value="SafetyCenterFunctionalMultiUsersTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
+ <option name="compatibility:include-filter" value="SafetyCenterActivityFunctionalTestCases" />
+ <option name="compatibility:module-arg" value="SafetyCenterActivityFunctionalTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
+ <option name="compatibility:include-filter" value="SafetyCenterHostSideTestCases" />
+ <option name="compatibility:module-arg" value="SafetyCenterHostSideTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-rkpd-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-rkpd-tests-list-user.xml
new file mode 100644
index 0000000..e652084
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-rkpd-tests-list-user.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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="List mts metrics tests that do not need root access">
+ <option name="compatibility:include-filter" value="service-rkp-unittest" />
+ <option name="compatibility:include-filter" value="GtsGmscoreHostTestCases com.google.android.gts.security.AttestationRootHostTest" />
+ <option name="compatibility:include-filter" value="RkpdAppGoogleIntegrationTests" />
+ <option name="compatibility:include-filter" value="RkpdAppGoogleUnitTests" />
+ <option name="compatibility:include-filter" value="RkpdAppGoogleStressTests" />
+
+ <option name="compatibility:module-arg" value="GtsGmscoreHostTestCases:enable:true" />
+ <option name="compatibility:module-arg" value="RkpdAppGoogleIntegrationTests:enable:true" />
+ <option name="compatibility:module-arg" value="RkpdAppGoogleUnitTests:enable:true" />
+ <option name="compatibility:module-arg" value="RkpdAppGoogleStressTests:enable:true" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-rkpd.xml b/tools/mts-tradefed/res/config/mts-rkpd.xml
new file mode 100644
index 0000000..7b2fecb
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-rkpd.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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 MTS-rkpd from a pre-existing MTS installation">
+
+ <include name="mts" />
+
+ <include name="mts-rkpd-tests-list-user" />
+
+ <option name="plan" value="mts-rkpd" />
+
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
index 109e16d..7e33a39 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
@@ -22,6 +22,7 @@
<include name="mts-dnsresolver-tests-list-eng-only" />
<include name="mts-documentsUI-usedapi-tests-list-eng-only" />
<include name="mts-mediaprovider-tests-list-eng-only" />
+ <include name="mts-network-tests-list-eng-only" />
<include name="mts-statsd-tests-list-eng-only" />
<include name="mts-tethering-tests-list-eng-only" />
<include name="mts-uwb-tests-list-eng-only" />
diff --git a/tools/mts-tradefed/res/config/mts-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
index a216fe2..6614a8f 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
@@ -18,20 +18,23 @@
<include name="mts-art-tests-list-user" />
<include name="mts-art-extra-tests-list-user" />
<include name="mts-cellbroadcast-oem-tests-list" />
+ <include name="mts-configinfrastructure-tests-list" />
<include name="mts-conscrypt-tests-list-user" />
<include name="mts-core-tests-list-user" />
<include name="mts-dnsresolver-tests-list-user" />
<include name="mts-documentsUI-oem-tests-list" />
<include name="mts-documentsUI-usedapi-tests-list" />
<include name="mts-extservices-tests-list" />
+ <include name="mts-healthfitness-tests-list">
<include name="mts-linkerconfig-tests-list" />
<include name="mts-ipsec-tests-list" />
<include name="mts-media-tests-list" />
<include name="mts-mediaprovider-tests-list-user" />
- <include name="mts-network-tests-list" />
+ <include name="mts-network-tests-list-user" />
<include name="mts-neuralnetworks-tests-list" />
<include name="mts-permission-tests-list-oem" />
<include name="mts-preload-verify-tests-list" />
+ <include name="mts-rkpd-tests-list-user" />
<include name="mts-scheduling-tests-list" />
<include name="mts-sdkextensions-tests-list" />
<include name="mts-statsd-tests-list-user" />
diff --git a/tools/mts-tradefed/res/config/mts-tethering-coverage.xml b/tools/mts-tradefed/res/config/mts-tethering-coverage.xml
index fc6d36e..c9c756c 100644
--- a/tools/mts-tradefed/res/config/mts-tethering-coverage.xml
+++ b/tools/mts-tradefed/res/config/mts-tethering-coverage.xml
@@ -24,6 +24,9 @@
<option name="compatibility:include-filter" value="libnetworkstats_test" />
<option name="compatibility:include-filter" value="traffic_controller_unit_test" />
<option name="compatibility:include-filter" value="libclat_test" />
+ <option name="compatibility:include-filter" value="NetHttpCoverageTests" />
+ <option name="compatibility:include-filter" value="net_unittests_tester" />
+ <option name="compatibility:include-filter" value="cronet_unittests_tester" />
<!-- Coverage runs are significantly slower than normal runs, and testFuzzing cannot
complete before the general test timeout (5 minutes) on such configurations. It is
diff --git a/tools/mts-tradefed/res/config/mts-tethering-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-tethering-tests-list-user.xml
index 7e33ac1..9b7e83a 100644
--- a/tools/mts-tradefed/res/config/mts-tethering-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-tethering-tests-list-user.xml
@@ -16,16 +16,24 @@
<configuration description="List of MTS tethering tests that do not need root acccess">
<option name="compatibility:include-filter" value="CtsNetTestCasesLatestSdk" />
+ <option name="compatibility:include-filter" value="CtsNetTestCasesMaxTargetSdk33" />
+ <option name="compatibility:include-filter" value="CtsNetTestCasesMaxTargetSdk31" />
+ <option name="compatibility:include-filter" value="CtsNetTestCasesMaxTargetSdk30" />
<option name="compatibility:include-filter" value="MtsTetheringTestLatestSdk" />
<option name="compatibility:include-filter" value="CtsTetheringTestLatestSdk" />
<option name="compatibility:include-filter" value="NearbyUnitTests" />
<option name="compatibility:include-filter" value="CtsNearbyFastPairTestCases" />
+ <option name="compatibility:include-filter" value="CtsNetHttpTestCases" />
<!-- Enable tethering MTS tests to use MainlineTestModuleController -->
<option name="compatibility:module-arg" value="CtsNetTestCasesLatestSdk:enable:true" />
+ <option name="compatibility:module-arg" value="CtsNetTestCasesMaxTargetSdk33:enable:true" />
+ <option name="compatibility:module-arg" value="CtsNetTestCasesMaxTargetSdk31:enable:true" />
+ <option name="compatibility:module-arg" value="CtsNetTestCasesMaxTargetSdk30:enable:true" />
<option name="compatibility:module-arg" value="MtsTetheringTestLatestSdk:enable:true" />
<option name="compatibility:module-arg" value="CtsTetheringTestLatestSdk:enable:true" />
<option name="compatibility:module-arg" value="NearbyUnitTests:enable:true" />
<option name="compatibility:module-arg" value="CtsNearbyFastPairTestCases:enable:true" />
+ <option name="compatibility:module-arg" value="CtsNetHttpTestCases:enable:true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-user-sep.xml b/tools/mts-tradefed/res/config/mts-user-sep.xml
index f3a239a..09c34e9 100644
--- a/tools/mts-tradefed/res/config/mts-user-sep.xml
+++ b/tools/mts-tradefed/res/config/mts-user-sep.xml
@@ -23,7 +23,7 @@
<include name="mts-dnsresolver-tests-list-user" />
<include name="mts-ipsec-tests-list" />
<include name="mts-media-tests-list" />
- <include name="mts-network-tests-list" />
+ <include name="mts-network-tests-list-user" />
<include name="mts-neuralnetworks-tests-list" />
<include name="mts-permission-tests-list" />
<include name="mts-preload-verify-tests-list" />
diff --git a/tools/mts-tradefed/tests/src/com/android/compatibility/tradefed/MtsUnitTests.java b/tools/mts-tradefed/tests/src/com/android/compatibility/tradefed/MtsUnitTests.java
index a796fa0..65709dc 100644
--- a/tools/mts-tradefed/tests/src/com/android/compatibility/tradefed/MtsUnitTests.java
+++ b/tools/mts-tradefed/tests/src/com/android/compatibility/tradefed/MtsUnitTests.java
@@ -1,4 +1,3 @@
-
/*
* Copyright (C) 2022 The Android Open Source Project
*
@@ -14,12 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.android.compatibility.tradefed;
+
import com.android.compatibility.common.tradefed.loading.CommonConfigLoadingTest;
import com.android.compatibility.tradefed.MtsTradefedTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
+
/**
* A test suite for all MTS Trade Federation unit tests running under Junit4.
*
@@ -29,10 +31,10 @@
@RunWith(Suite.class)
@SuiteClasses({
MtsTradefedTest.class,
+
// Loading test
CommonConfigLoadingTest.class,
})
public class MtsUnitTests {
// empty on purpose
}
-
