Snap for 8426163 from 16a26c83c4d55b865a5ba886d1e69581637a80bc to mainline-tzdata2-release
Change-Id: I1f469dd3da6d439552e775f08744a27b114957ae
diff --git a/tools/build/config.mk b/tools/build/config.mk
index 0849379..b85731f 100644
--- a/tools/build/config.mk
+++ b/tools/build/config.mk
@@ -32,7 +32,6 @@
networking \
neuralnetworks \
permission \
- scheduling \
sdkextensions \
statsd \
tethering \
diff --git a/tools/mts-tradefed/Android.bp b/tools/mts-tradefed/Android.bp
index 1c20ad5..184915f 100644
--- a/tools/mts-tradefed/Android.bp
+++ b/tools/mts-tradefed/Android.bp
@@ -13,16 +13,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
tradefed_binary_host {
name: "mts-tradefed",
wrapper: "etc/mts-tradefed",
short_name: "MTS",
full_name: "Mainline Test Suite",
- version: "3.0",
+ version: "2.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 3f5cdb5..0bb1db1 100755
--- a/tools/mts-tradefed/etc/mts-tradefed
+++ b/tools/mts-tradefed/etc/mts-tradefed
@@ -80,8 +80,29 @@
JAR_DIR=${MTS_ROOT}/android-mts/tools
-for JAR in ${JAR_DIR}/*.jar; do
- JAR_PATH=${JAR_PATH}:${JAR}
+TRADEFED_JAR="tradefed"
+
+JARS="tradefed
+ loganalysis
+ hosttestlib
+ compatibility-host-util
+ mts-tradefed
+ mts-tradefed-tests"
+
+for JAR in $JARS; do
+ checkFile ${JAR_DIR}/${JAR}.jar
+ JAR_PATH=${JAR_PATH}:${JAR_DIR}/${JAR}.jar
+done
+
+OPTIONAL_JARS="
+ google-tradefed
+ google-tradefed-tests
+ google-tf-prod-tests"
+
+for JAR in $OPTIONAL_JARS; do
+ if [ -f "$JAR.jar" ]; then
+ JAR_PATH=${JAR_PATH}:${JAR_DIR}/${JAR}.jar
+ fi;
done
# check if APE_API_KEY is set in the env by user.
diff --git a/tools/mts-tradefed/res/config/OWNERS b/tools/mts-tradefed/res/config/OWNERS
index 8dc7740..7f8ae55 100644
--- a/tools/mts-tradefed/res/config/OWNERS
+++ b/tools/mts-tradefed/res/config/OWNERS
@@ -1,2 +1 @@
-per-file mts-art*.xml = rpl@google.com
-per-file mts-sdkextensions*.xml = file: platform/packages/modules/SdkExtensions:/OWNERS
+per-file mts-sdkextensions.xml = file: platform/frameworks/base:/apex/sdkextensions/OWNERS
diff --git a/tools/mts-tradefed/res/config/collect-tests-only.xml b/tools/mts-tradefed/res/config/collect-tests-only.xml
deleted file mode 100644
index 995aca7..0000000
--- a/tools/mts-tradefed/res/config/collect-tests-only.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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 from pre-existing MTS installation">
-
-<option name="plan" value="collect-tests-only" />
-
-<include name="mts" />
-<include name="mts-tests-list-user" />
-<include name="mts-tests-list-eng-only" />
-
-<option name="compatibility:collect-tests-only" value="true" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-appscheduling-tests-list.xml b/tools/mts-tradefed/res/config/mts-appscheduling-tests-list.xml
deleted file mode 100644
index f47ba10..0000000
--- a/tools/mts-tradefed/res/config/mts-appscheduling-tests-list.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2021 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="MTS test list for Scheduling">
-
- <option name="compatibility:include-filter" value="CtsAlarmManagerTestCases" />
- <option name="compatibility:include-filter" value="CtsAppUsageHostTestCases" />
- <option name="compatibility:include-filter" value="CtsBatterySavingTestCases" />
- <option name="compatibility:include-filter" value="CtsJobSchedulerTestCases" />
-
- <!-- Enable Scheduling MTS tests to use MainlineTestModuleController -->
- <option name="compatibility:module-arg" value="CtsAlarmManagerTestCases:enable:false" />
- <option name="compatibility:module-arg" value="CtsAppUsageHostTestCases:enable:false" />
- <option name="compatibility:module-arg" value="CtsBatterySavingTestCases:enable:false" />
- <option name="compatibility:module-arg" value="CtsJobSchedulerTestCases:enable:false" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-appscheduling.xml b/tools/mts-tradefed/res/config/mts-appscheduling.xml
deleted file mode 100644
index ef33a05..0000000
--- a/tools/mts-tradefed/res/config/mts-appscheduling.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2021 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-appscheduling from a pre-existing MTS installation">
-
- <include name="mts" />
-
- <option name="plan" value="mts-appscheduling" />
-
- <include name="mts-appscheduling-tests-list" />
-
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-shard-00.xml b/tools/mts-tradefed/res/config/mts-art-shard-00.xml
deleted file mode 100644
index 333e209..0000000
--- a/tools/mts-tradefed/res/config/mts-art-shard-00.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by `regen-test-files`. Do not edit manually. -->
-<!-- Copyright (C) 2020 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Run mts-art-shard-00 from a preexisting MTS installation.">
- <include name="mts"/>
- <include name="mts-art-tests-list-user-shard-00"/>
- <option name="plan" value="mts-art-shard-00"/>
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-shard-01.xml b/tools/mts-tradefed/res/config/mts-art-shard-01.xml
deleted file mode 100644
index f4e528a..0000000
--- a/tools/mts-tradefed/res/config/mts-art-shard-01.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by `regen-test-files`. Do not edit manually. -->
-<!-- Copyright (C) 2020 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Run mts-art-shard-01 from a preexisting MTS installation.">
- <include name="mts"/>
- <include name="mts-art-tests-list-user-shard-01"/>
- <option name="plan" value="mts-art-shard-01"/>
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-shard-02.xml b/tools/mts-tradefed/res/config/mts-art-shard-02.xml
deleted file mode 100644
index 53a6a55..0000000
--- a/tools/mts-tradefed/res/config/mts-art-shard-02.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by `regen-test-files`. Do not edit manually. -->
-<!-- Copyright (C) 2021 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="Run mts-art-shard-02 from a preexisting MTS installation.">
- <include name="mts"/>
- <include name="mts-art-tests-list-user-shard-02"/>
- <option name="plan" value="mts-art-shard-02"/>
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-eng-only.xml
deleted file mode 100644
index 8704334..0000000
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-eng-only.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="List of ART MTS tests that need root access.">
-
- <!-- ART gtests. -->
- <!-- TODO(b/167385698): Identify ART gtests that to not require root access
- and move them from this "eng-only" list to the "user"
- list. -->
- <!-- Temporarily disable ART gtests in MTS, as they require the
- installation of the Testing ART APEX, which is currently
- being blocked on internal builds, making MTS runs fail with
- this error:
-
- com.android.tradefed.targetprep.TargetSetupError: Mainline
- module com.android.art is not preloaded on the device but
- is in the input lists.
-
- TODO(b/162834439): Re-enable ART gtests when they are
- uncoupled from the ART APEX. -->
- <!--
- <option name="compatibility:include-filter" value="ArtGtestsTargetInstallApex" />
- -->
-
- <!-- Enable MainlineTestModuleController. -->
- <!-- Option disabled for the same reason as above.
-
- TODO(b/162834439): Re-enable ART gtests when they are
- uncoupled from the ART APEX. -->
- <!--
- <option name="compatibility:module-arg" value="ArtGtestsTargetInstallApex:enable:true" />
- -->
-</configuration>
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
deleted file mode 100644
index 96b133b..0000000
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml
+++ /dev/null
@@ -1,804 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by `regen-test-files`. Do not edit manually. -->
-<!-- Copyright (C) 2020 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="List of ART MTS tests that do not need root access (shard 00)">
- <!-- ART run-tests. -->
- <!-- TODO(rpl): Find a way to express this list in a more concise fashion. -->
- <option name="compatibility:include-filter" value="art-run-test-001-HelloWorld"/>
- <option name="compatibility:include-filter" value="art-run-test-001-Main"/>
- <option name="compatibility:include-filter" value="art-run-test-002-sleep"/>
- <option name="compatibility:include-filter" value="art-run-test-004-InterfaceTest"/>
- <option name="compatibility:include-filter" value="art-run-test-004-checker-UnsafeTest18"/>
- <option name="compatibility:include-filter" value="art-run-test-006-args"/>
- <option name="compatibility:include-filter" value="art-run-test-007-count10"/>
- <option name="compatibility:include-filter" value="art-run-test-009-instanceof"/>
- <option name="compatibility:include-filter" value="art-run-test-010-instance"/>
- <option name="compatibility:include-filter" value="art-run-test-011-array-copy"/>
- <option name="compatibility:include-filter" value="art-run-test-012-math"/>
- <option name="compatibility:include-filter" value="art-run-test-013-math2"/>
- <option name="compatibility:include-filter" value="art-run-test-014-math3"/>
- <option name="compatibility:include-filter" value="art-run-test-015-switch"/>
- <option name="compatibility:include-filter" value="art-run-test-016-intern"/>
- <option name="compatibility:include-filter" value="art-run-test-017-float"/>
- <option name="compatibility:include-filter" value="art-run-test-018-stack-overflow"/>
- <option name="compatibility:include-filter" value="art-run-test-019-wrong-array-type"/>
- <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-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-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"/>
- <option name="compatibility:include-filter" value="art-run-test-037-inherit"/>
- <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-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"/>
- <option name="compatibility:include-filter" value="art-run-test-047-returns"/>
- <option name="compatibility:include-filter" value="art-run-test-048-reflect-v8"/>
- <option name="compatibility:include-filter" value="art-run-test-049-show-object"/>
- <option name="compatibility:include-filter" value="art-run-test-050-sync-test"/>
- <option name="compatibility:include-filter" value="art-run-test-052-verifier-fun"/>
- <option name="compatibility:include-filter" value="art-run-test-053-wait-some"/>
- <option name="compatibility:include-filter" value="art-run-test-055-enum-performance"/>
- <option name="compatibility:include-filter" value="art-run-test-058-enum-order"/>
- <option name="compatibility:include-filter" value="art-run-test-059-finalizer-throw"/>
- <option name="compatibility:include-filter" value="art-run-test-061-out-of-memory"/>
- <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-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-074-gc-thrash"/>
- <option name="compatibility:include-filter" value="art-run-test-076-boolean-put"/>
- <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"/>
- <option name="compatibility:include-filter" value="art-run-test-080-oom-throw"/>
- <option name="compatibility:include-filter" value="art-run-test-080-oom-throw-with-finalizer"/>
- <option name="compatibility:include-filter" value="art-run-test-081-hot-exceptions"/>
- <option name="compatibility:include-filter" value="art-run-test-082-inline-execute"/>
- <option name="compatibility:include-filter" value="art-run-test-083-compiler-regressions"/>
- <option name="compatibility:include-filter" value="art-run-test-084-class-init"/>
- <option name="compatibility:include-filter" value="art-run-test-090-loop-formation"/>
- <option name="compatibility:include-filter" value="art-run-test-092-locale"/>
- <option name="compatibility:include-filter" value="art-run-test-093-serialization"/>
- <option name="compatibility:include-filter" value="art-run-test-094-pattern"/>
- <option name="compatibility:include-filter" value="art-run-test-095-switch-MAX_INT"/>
- <option name="compatibility:include-filter" value="art-run-test-099-vmdebug"/>
- <option name="compatibility:include-filter" value="art-run-test-100-reflect2"/>
- <option name="compatibility:include-filter" value="art-run-test-101-fibonacci"/>
- <option name="compatibility:include-filter" value="art-run-test-102-concurrent-gc"/>
- <option name="compatibility:include-filter" value="art-run-test-103-string-append"/>
- <option name="compatibility:include-filter" value="art-run-test-104-growth-limit"/>
- <option name="compatibility:include-filter" value="art-run-test-105-invoke"/>
- <option name="compatibility:include-filter" value="art-run-test-106-exceptions2"/>
- <option name="compatibility:include-filter" value="art-run-test-107-int-math2"/>
- <option name="compatibility:include-filter" value="art-run-test-108-check-cast"/>
- <option name="compatibility:include-filter" value="art-run-test-109-suspend-check"/>
- <option name="compatibility:include-filter" value="art-run-test-110-field-access"/>
- <option name="compatibility:include-filter" value="art-run-test-112-double-math"/>
- <option name="compatibility:include-filter" value="art-run-test-114-ParallelGC"/>
- <option name="compatibility:include-filter" value="art-run-test-120-hashcode"/>
- <option name="compatibility:include-filter" value="art-run-test-121-simple-suspend-check"/>
- <option name="compatibility:include-filter" value="art-run-test-122-npe"/>
- <option name="compatibility:include-filter" value="art-run-test-123-compiler-regressions-mt"/>
- <option name="compatibility:include-filter" value="art-run-test-123-inline-execute2"/>
- <option name="compatibility:include-filter" value="art-run-test-125-gc-and-classloading"/>
- <option name="compatibility:include-filter" value="art-run-test-128-reg-spill-on-implicit-nullcheck"/>
- <option name="compatibility:include-filter" value="art-run-test-129-ThreadGetId"/>
- <option name="compatibility:include-filter" value="art-run-test-132-daemon-locks-shutdown"/>
- <option name="compatibility:include-filter" value="art-run-test-133-static-invoke-super"/>
- <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-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"/>
- <option name="compatibility:include-filter" value="art-run-test-159-app-image-fields"/>
- <option name="compatibility:include-filter" value="art-run-test-163-app-image-methods"/>
- <option name="compatibility:include-filter" value="art-run-test-165-lock-owner-proxy"/>
- <option name="compatibility:include-filter" value="art-run-test-168-vmstack-annotated"/>
- <option name="compatibility:include-filter" value="art-run-test-170-interface-init"/>
- <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-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"/>
- <option name="compatibility:include-filter" value="art-run-test-2019-constantcalculationsinking"/>
- <option name="compatibility:include-filter" value="art-run-test-202-thread-oome"/>
- <option name="compatibility:include-filter" value="art-run-test-2020-InvokeVirtual-Inlining"/>
- <option name="compatibility:include-filter" value="art-run-test-2021-InvokeStatic-Inlining"/>
- <option name="compatibility:include-filter" value="art-run-test-2022-Invariantloops"/>
- <option name="compatibility:include-filter" value="art-run-test-2023-InvariantLoops_typecast"/>
- <option name="compatibility:include-filter" value="art-run-test-2024-InvariantNegativeLoop"/>
- <option name="compatibility:include-filter" value="art-run-test-2025-ChangedArrayValue"/>
- <option name="compatibility:include-filter" value="art-run-test-2026-DifferentMemoryLSCouples"/>
- <option name="compatibility:include-filter" value="art-run-test-2027-TwiceTheSameMemoryCouple"/>
- <option name="compatibility:include-filter" value="art-run-test-2028-MultiBackward"/>
- <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-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-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"/>
- <option name="compatibility:include-filter" value="art-run-test-304-method-tracing"/>
- <option name="compatibility:include-filter" value="art-run-test-401-optimizing-compiler"/>
- <option name="compatibility:include-filter" value="art-run-test-402-optimizing-control-flow"/>
- <option name="compatibility:include-filter" value="art-run-test-403-optimizing-long"/>
- <option name="compatibility:include-filter" value="art-run-test-404-optimizing-allocator"/>
- <option name="compatibility:include-filter" value="art-run-test-405-optimizing-long-allocator"/>
- <option name="compatibility:include-filter" value="art-run-test-406-fields"/>
- <option name="compatibility:include-filter" value="art-run-test-407-arrays"/>
- <option name="compatibility:include-filter" value="art-run-test-408-move-bug"/>
- <option name="compatibility:include-filter" value="art-run-test-409-materialized-condition"/>
- <option name="compatibility:include-filter" value="art-run-test-410-floats"/>
- <option name="compatibility:include-filter" value="art-run-test-411-checker-hdiv-hrem-pow2"/>
- <option name="compatibility:include-filter" value="art-run-test-411-checker-instruct-simplifier-hrem"/>
- <option name="compatibility:include-filter" value="art-run-test-411-optimizing-arith"/>
- <option name="compatibility:include-filter" value="art-run-test-413-regalloc-regression"/>
- <option name="compatibility:include-filter" value="art-run-test-414-static-fields"/>
- <option name="compatibility:include-filter" value="art-run-test-418-const-string"/>
- <option name="compatibility:include-filter" value="art-run-test-419-long-parameter"/>
- <option name="compatibility:include-filter" value="art-run-test-420-const-class"/>
- <option name="compatibility:include-filter" value="art-run-test-421-exceptions"/>
- <option name="compatibility:include-filter" value="art-run-test-421-large-frame"/>
- <option name="compatibility:include-filter" value="art-run-test-422-instanceof"/>
- <option name="compatibility:include-filter" value="art-run-test-422-type-conversion"/>
- <option name="compatibility:include-filter" value="art-run-test-423-invoke-interface"/>
- <option name="compatibility:include-filter" value="art-run-test-424-checkcast"/>
- <option name="compatibility:include-filter" value="art-run-test-426-monitor"/>
- <option name="compatibility:include-filter" value="art-run-test-427-bitwise"/>
- <option name="compatibility:include-filter" value="art-run-test-427-bounds"/>
- <option name="compatibility:include-filter" value="art-run-test-429-ssa-builder"/>
- <option name="compatibility:include-filter" value="art-run-test-430-live-register-slow-path"/>
- <option name="compatibility:include-filter" value="art-run-test-433-gvn"/>
- <option name="compatibility:include-filter" value="art-run-test-434-shifter-operand"/>
- <option name="compatibility:include-filter" value="art-run-test-435-try-finally-without-catch"/>
- <option name="compatibility:include-filter" value="art-run-test-436-rem-float"/>
- <option name="compatibility:include-filter" value="art-run-test-436-shift-constant"/>
- <option name="compatibility:include-filter" value="art-run-test-437-inline"/>
- <option name="compatibility:include-filter" value="art-run-test-438-volatile"/>
- <option name="compatibility:include-filter" value="art-run-test-439-npe"/>
- <option name="compatibility:include-filter" value="art-run-test-439-swap-double"/>
- <option name="compatibility:include-filter" value="art-run-test-440-stmp"/>
- <option name="compatibility:include-filter" value="art-run-test-441-checker-inliner"/>
- <option name="compatibility:include-filter" value="art-run-test-443-not-bool-inline"/>
- <option name="compatibility:include-filter" value="art-run-test-444-checker-nce"/>
- <option name="compatibility:include-filter" value="art-run-test-445-checker-licm"/>
- <option name="compatibility:include-filter" value="art-run-test-446-checker-inliner2"/>
- <option name="compatibility:include-filter" value="art-run-test-447-checker-inliner3"/>
- <option name="compatibility:include-filter" value="art-run-test-449-checker-bce-rem"/>
- <option name="compatibility:include-filter" value="art-run-test-451-regression-add-float"/>
- <option name="compatibility:include-filter" value="art-run-test-451-spill-splot"/>
- <option name="compatibility:include-filter" value="art-run-test-455-checker-gvn"/>
- <option name="compatibility:include-filter" value="art-run-test-456-baseline-array-set"/>
- <option name="compatibility:include-filter" value="art-run-test-458-long-to-fpu"/>
- <option name="compatibility:include-filter" value="art-run-test-464-checker-inline-sharpen-calls"/>
- <option name="compatibility:include-filter" value="art-run-test-465-checker-clinit-gvn"/>
- <option name="compatibility:include-filter" value="art-run-test-469-condition-materialization"/>
- <option name="compatibility:include-filter" value="art-run-test-470-huge-method"/>
- <option name="compatibility:include-filter" value="art-run-test-471-deopt-environment"/>
- <option name="compatibility:include-filter" value="art-run-test-472-type-propagation"/>
- <option name="compatibility:include-filter" value="art-run-test-473-checker-inliner-constants"/>
- <option name="compatibility:include-filter" value="art-run-test-473-remove-dead-block"/>
- <option name="compatibility:include-filter" value="art-run-test-474-checker-boolean-input"/>
- <option name="compatibility:include-filter" value="art-run-test-474-fp-sub-neg"/>
- <option name="compatibility:include-filter" value="art-run-test-475-simplify-mul-zero"/>
- <option name="compatibility:include-filter" value="art-run-test-476-checker-ctor-memory-barrier"/>
- <option name="compatibility:include-filter" value="art-run-test-476-clinit-inline-static-invoke"/>
- <option name="compatibility:include-filter" value="art-run-test-477-checker-bound-type"/>
- <option name="compatibility:include-filter" value="art-run-test-477-long-2-float-convers-precision"/>
- <option name="compatibility:include-filter" value="art-run-test-478-checker-inline-noreturn"/>
- <option name="compatibility:include-filter" value="art-run-test-478-checker-inliner-nested-loop"/>
- <option name="compatibility:include-filter" value="art-run-test-479-regression-implicit-null-check"/>
- <option name="compatibility:include-filter" value="art-run-test-480-checker-dead-blocks"/>
- <option name="compatibility:include-filter" value="art-run-test-481-regression-phi-cond"/>
- <option name="compatibility:include-filter" value="art-run-test-483-dce-block"/>
- <option name="compatibility:include-filter" value="art-run-test-485-checker-dce-switch"/>
- <option name="compatibility:include-filter" value="art-run-test-486-checker-must-do-null-check"/>
- <option name="compatibility:include-filter" value="art-run-test-487-checker-inline-calls"/>
- <option name="compatibility:include-filter" value="art-run-test-488-checker-inline-recursive-calls"/>
- <option name="compatibility:include-filter" value="art-run-test-489-current-method-regression"/>
- <option name="compatibility:include-filter" value="art-run-test-490-checker-inline"/>
- <option name="compatibility:include-filter" value="art-run-test-491-current-method"/>
- <option name="compatibility:include-filter" value="art-run-test-492-checker-inline-invoke-interface"/>
- <option name="compatibility:include-filter" value="art-run-test-493-checker-inline-invoke-interface"/>
- <option name="compatibility:include-filter" value="art-run-test-494-checker-instanceof-tests"/>
- <option name="compatibility:include-filter" value="art-run-test-495-checker-checkcast-tests"/>
- <option name="compatibility:include-filter" value="art-run-test-496-checker-inlining-class-loader"/>
- <option name="compatibility:include-filter" value="art-run-test-499-bce-phi-array-length"/>
- <option name="compatibility:include-filter" value="art-run-test-500-instanceof"/>
- <option name="compatibility:include-filter" value="art-run-test-505-simplifier-type-propagation"/>
- <option name="compatibility:include-filter" value="art-run-test-507-boolean-test"/>
- <option name="compatibility:include-filter" value="art-run-test-507-referrer"/>
- <option name="compatibility:include-filter" value="art-run-test-508-checker-disassembly"/>
- <option name="compatibility:include-filter" value="art-run-test-508-referrer-method"/>
- <option name="compatibility:include-filter" value="art-run-test-513-array-deopt"/>
- <option name="compatibility:include-filter" value="art-run-test-514-shifts"/>
- <option name="compatibility:include-filter" value="art-run-test-519-bound-load-class"/>
- <option name="compatibility:include-filter" value="art-run-test-521-checker-array-set-null"/>
- <option name="compatibility:include-filter" value="art-run-test-521-regression-integer-field-set"/>
- <option name="compatibility:include-filter" value="art-run-test-524-boolean-simplifier-regression"/>
- <option name="compatibility:include-filter" value="art-run-test-525-checker-arrays-fields1"/>
- <option name="compatibility:include-filter" value="art-run-test-525-checker-arrays-fields2"/>
- <option name="compatibility:include-filter" value="art-run-test-526-long-regalloc"/>
- <option name="compatibility:include-filter" value="art-run-test-527-checker-array-access-simd"/>
- <option name="compatibility:include-filter" value="art-run-test-527-checker-array-access-split"/>
- <option name="compatibility:include-filter" value="art-run-test-528-long-hint"/>
- <option name="compatibility:include-filter" value="art-run-test-529-long-split"/>
- <option name="compatibility:include-filter" value="art-run-test-530-checker-loops1"/>
- <option name="compatibility:include-filter" value="art-run-test-530-checker-loops2"/>
- <option name="compatibility:include-filter" value="art-run-test-530-checker-loops3"/>
- <option name="compatibility:include-filter" value="art-run-test-530-checker-loops4"/>
- <option name="compatibility:include-filter" value="art-run-test-530-checker-loops5"/>
- <option name="compatibility:include-filter" value="art-run-test-530-checker-lse-ctor-fences"/>
- <option name="compatibility:include-filter" value="art-run-test-530-checker-lse-simd"/>
- <option name="compatibility:include-filter" value="art-run-test-530-instanceof-checkcast"/>
- <option name="compatibility:include-filter" value="art-run-test-532-checker-nonnull-arrayset"/>
- <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-537-checker-arraycopy"/>
- <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"/>
- <option name="compatibility:include-filter" value="art-run-test-542-bitfield-rotates"/>
- <option name="compatibility:include-filter" value="art-run-test-542-inline-trycatch"/>
- <option name="compatibility:include-filter" value="art-run-test-542-unresolved-access-check"/>
- <option name="compatibility:include-filter" value="art-run-test-545-tracing-and-jit"/>
- <option name="compatibility:include-filter" value="art-run-test-548-checker-inlining-and-dce"/>
- <option name="compatibility:include-filter" value="art-run-test-549-checker-types-merge"/>
- <option name="compatibility:include-filter" value="art-run-test-550-checker-multiply-accumulate"/>
- <option name="compatibility:include-filter" value="art-run-test-550-new-instance-clinit"/>
- <option name="compatibility:include-filter" value="art-run-test-551-checker-clinit"/>
- <option name="compatibility:include-filter" value="art-run-test-551-implicit-null-checks"/>
- <option name="compatibility:include-filter" value="art-run-test-552-checker-x86-avx2-bit-manipulation"/>
- <option name="compatibility:include-filter" value="art-run-test-554-checker-rtp-checkcast"/>
- <option name="compatibility:include-filter" value="art-run-test-557-checker-instruct-simplifier-ror"/>
- <option name="compatibility:include-filter" value="art-run-test-558-switch"/>
- <option name="compatibility:include-filter" value="art-run-test-559-bce-ssa"/>
- <option name="compatibility:include-filter" value="art-run-test-559-checker-rtp-ifnotnull"/>
- <option name="compatibility:include-filter" value="art-run-test-560-packed-switch"/>
- <option name="compatibility:include-filter" value="art-run-test-561-divrem"/>
- <option name="compatibility:include-filter" value="art-run-test-561-shared-slowpaths"/>
- <option name="compatibility:include-filter" value="art-run-test-562-bce-preheader"/>
- <option name="compatibility:include-filter" value="art-run-test-563-checker-invoke-super"/>
- <option name="compatibility:include-filter" value="art-run-test-564-checker-bitcount"/>
- <option name="compatibility:include-filter" value="art-run-test-564-checker-inline-loop"/>
- <option name="compatibility:include-filter" value="art-run-test-564-checker-negbitwise"/>
- <option name="compatibility:include-filter" value="art-run-test-565-checker-condition-liveness"/>
- <option name="compatibility:include-filter" value="art-run-test-566-checker-codegen-select"/>
- <option name="compatibility:include-filter" value="art-run-test-567-checker-builder-intrinsics"/>
- <option name="compatibility:include-filter" value="art-run-test-568-checker-onebit"/>
- <option name="compatibility:include-filter" value="art-run-test-570-checker-select"/>
- <option name="compatibility:include-filter" value="art-run-test-572-checker-array-get-regression"/>
- <option name="compatibility:include-filter" value="art-run-test-573-checker-checkcast-regression"/>
- <option name="compatibility:include-filter" value="art-run-test-576-polymorphic-inlining"/>
- <option name="compatibility:include-filter" value="art-run-test-577-checker-fp2int"/>
- <option name="compatibility:include-filter" value="art-run-test-578-bce-visit"/>
- <option name="compatibility:include-filter" value="art-run-test-578-polymorphic-inlining"/>
- <option name="compatibility:include-filter" value="art-run-test-579-inline-infinite"/>
- <option name="compatibility:include-filter" value="art-run-test-580-checker-round"/>
- <option name="compatibility:include-filter" value="art-run-test-580-crc32"/>
- <option name="compatibility:include-filter" value="art-run-test-581-rtp"/>
- <option name="compatibility:include-filter" value="art-run-test-582-checker-bce-length"/>
- <option name="compatibility:include-filter" value="art-run-test-584-checker-div-bool"/>
- <option name="compatibility:include-filter" value="art-run-test-589-super-imt"/>
- <option name="compatibility:include-filter" value="art-run-test-590-checker-arr-set-null-regression"/>
- <option name="compatibility:include-filter" value="art-run-test-591-checker-regression-dead-loop"/>
- <option name="compatibility:include-filter" value="art-run-test-593-checker-long-2-float-regression"/>
- <option name="compatibility:include-filter" value="art-run-test-594-checker-array-alias"/>
- <option name="compatibility:include-filter" value="art-run-test-594-load-string-regression"/>
- <option name="compatibility:include-filter" value="art-run-test-603-checker-instanceof"/>
- <option name="compatibility:include-filter" value="art-run-test-605-new-string-from-bytes"/>
- <option name="compatibility:include-filter" value="art-run-test-607-daemon-stress"/>
- <option name="compatibility:include-filter" value="art-run-test-609-checker-inline-interface"/>
- <option name="compatibility:include-filter" value="art-run-test-609-checker-x86-bounds-check"/>
- <option name="compatibility:include-filter" value="art-run-test-610-arraycopy"/>
- <option name="compatibility:include-filter" value="art-run-test-611-checker-simplify-if"/>
- <option name="compatibility:include-filter" value="art-run-test-614-checker-dump-constant-location"/>
- <option name="compatibility:include-filter" value="art-run-test-615-checker-arm64-store-zero"/>
- <option name="compatibility:include-filter" value="art-run-test-617-clinit-oome"/>
- <option name="compatibility:include-filter" value="art-run-test-618-checker-induction"/>
- <option name="compatibility:include-filter" value="art-run-test-619-checker-current-method"/>
- <option name="compatibility:include-filter" value="art-run-test-620-checker-bce-intrinsics"/>
- <option name="compatibility:include-filter" value="art-run-test-622-checker-bce-regressions"/>
- <option name="compatibility:include-filter" value="art-run-test-625-checker-licm-regressions"/>
- <option name="compatibility:include-filter" value="art-run-test-627-checker-unroll"/>
- <option name="compatibility:include-filter" value="art-run-test-628-vdex"/>
- <option name="compatibility:include-filter" value="art-run-test-631-checker-get-class"/>
- <option name="compatibility:include-filter" value="art-run-test-632-checker-char-at-bounds"/>
- <option name="compatibility:include-filter" value="art-run-test-635-checker-arm64-volatile-load-cc"/>
- <option name="compatibility:include-filter" value="art-run-test-636-arm64-veneer-pool"/>
- <option name="compatibility:include-filter" value="art-run-test-637-checker-throw-inline"/>
- <option name="compatibility:include-filter" value="art-run-test-640-checker-boolean-simd"/>
- <option name="compatibility:include-filter" value="art-run-test-640-checker-integer-valueof"/>
- <option name="compatibility:include-filter" value="art-run-test-640-checker-simd"/>
- <option name="compatibility:include-filter" value="art-run-test-641-checker-arraycopy"/>
- <option name="compatibility:include-filter" value="art-run-test-641-iterations"/>
- <option name="compatibility:include-filter" value="art-run-test-643-checker-bogus-ic"/>
- <option name="compatibility:include-filter" value="art-run-test-645-checker-abs-simd"/>
- <option name="compatibility:include-filter" value="art-run-test-646-checker-arraycopy-large-cst-pos"/>
- <option name="compatibility:include-filter" value="art-run-test-646-checker-long-const-to-int"/>
- <option name="compatibility:include-filter" value="art-run-test-646-checker-simd-hadd"/>
- <option name="compatibility:include-filter" value="art-run-test-650-checker-inline-access-thunks"/>
- <option name="compatibility:include-filter" value="art-run-test-654-checker-periodic"/>
- <option name="compatibility:include-filter" value="art-run-test-655-checker-simd-arm-opt"/>
- <option name="compatibility:include-filter" value="art-run-test-656-checker-simd-opt"/>
- <option name="compatibility:include-filter" value="art-run-test-657-branches"/>
- <option name="compatibility:include-filter" value="art-run-test-658-fp-read-barrier"/>
- <option name="compatibility:include-filter" value="art-run-test-660-checker-sad"/>
- <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-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"/>
- <option name="compatibility:include-filter" value="art-run-test-667-out-of-bounds"/>
- <option name="compatibility:include-filter" value="art-run-test-669-checker-break"/>
- <option name="compatibility:include-filter" value="art-run-test-671-npe-field-opts"/>
- <option name="compatibility:include-filter" value="art-run-test-672-checker-throw-method"/>
- <option name="compatibility:include-filter" value="art-run-test-673-checker-throw-vmethod"/>
- <option name="compatibility:include-filter" value="art-run-test-674-HelloWorld-Dm"/>
- <option name="compatibility:include-filter" value="art-run-test-676-proxy-jit-at-first-use"/>
- <option name="compatibility:include-filter" value="art-run-test-677-fsi2"/>
- <option name="compatibility:include-filter" value="art-run-test-680-sink-regression"/>
- <option name="compatibility:include-filter" value="art-run-test-684-checker-simd-dotprod"/>
- <option name="compatibility:include-filter" value="art-run-test-684-select-condition"/>
- <option name="compatibility:include-filter" value="art-run-test-689-multi-catch"/>
- <option name="compatibility:include-filter" value="art-run-test-694-clinit-jit"/>
- <option name="compatibility:include-filter" value="art-run-test-695-simplify-throws"/>
- <option name="compatibility:include-filter" value="art-run-test-696-loop"/>
- <option name="compatibility:include-filter" value="art-run-test-697-checker-string-append"/>
- <option name="compatibility:include-filter" value="art-run-test-698-selects"/>
- <option name="compatibility:include-filter" value="art-run-test-700-LoadArgRegs"/>
- <option name="compatibility:include-filter" value="art-run-test-703-floating-point-div"/>
- <option name="compatibility:include-filter" value="art-run-test-704-multiply-accumulate"/>
- <option name="compatibility:include-filter" value="art-run-test-705-register-conflict"/>
- <option name="compatibility:include-filter" value="art-run-test-711-checker-type-conversion"/>
- <option name="compatibility:include-filter" value="art-run-test-718-zipfile-finalizer"/>
- <option name="compatibility:include-filter" value="art-run-test-721-osr"/>
- <option name="compatibility:include-filter" value="art-run-test-726-array-store"/>
- <option name="compatibility:include-filter" value="art-run-test-730-checker-inlining-super"/>
- <option name="compatibility:include-filter" value="art-run-test-805-TooDeepClassInstanceOf"/>
- <option name="compatibility:include-filter" value="art-run-test-806-TooWideClassInstanceOf"/>
- <option name="compatibility:include-filter" value="art-run-test-812-recursive-default"/>
- <option name="compatibility:include-filter" value="art-run-test-814-large-field-offsets"/>
- <option name="compatibility:include-filter" value="art-run-test-815-invokeinterface-default"/>
- <option name="compatibility:include-filter" value="art-run-test-818-clinit-nterp"/>
- <option name="compatibility:include-filter" value="art-run-test-821-madvise-willneed"/>
- <option name="compatibility:include-filter" value="art-run-test-963-default-range-smali"/>
- <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_libdexfile_support_tests"/>
- <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_odrefresh_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_runtime_compiler_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_runtime_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_sigchain_tests"/>
- <!-- 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"/>
- <option name="compatibility:module-arg" value="art-run-test-001-Main:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-002-sleep:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-004-InterfaceTest:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-004-checker-UnsafeTest18:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-006-args:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-007-count10:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-009-instanceof:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-010-instance:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-011-array-copy:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-012-math:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-013-math2:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-014-math3:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-015-switch:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-016-intern:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-017-float:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-018-stack-overflow:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-019-wrong-array-type:enable:true"/>
- <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-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-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"/>
- <option name="compatibility:module-arg" value="art-run-test-037-inherit:enable:true"/>
- <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-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"/>
- <option name="compatibility:module-arg" value="art-run-test-047-returns:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-048-reflect-v8:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-049-show-object:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-050-sync-test:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-052-verifier-fun:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-053-wait-some:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-055-enum-performance:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-058-enum-order:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-059-finalizer-throw:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-061-out-of-memory:enable:true"/>
- <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-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-074-gc-thrash: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-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"/>
- <option name="compatibility:module-arg" value="art-run-test-080-oom-throw:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-080-oom-throw-with-finalizer:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-081-hot-exceptions:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-082-inline-execute:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-083-compiler-regressions:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-084-class-init:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-090-loop-formation:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-092-locale:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-093-serialization:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-094-pattern:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-095-switch-MAX_INT:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-099-vmdebug:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-100-reflect2:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-101-fibonacci:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-102-concurrent-gc:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-103-string-append:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-104-growth-limit:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-105-invoke:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-106-exceptions2:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-107-int-math2:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-108-check-cast:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-109-suspend-check:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-110-field-access:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-112-double-math:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-114-ParallelGC:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-120-hashcode:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-121-simple-suspend-check:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-122-npe:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-123-compiler-regressions-mt:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-123-inline-execute2:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-125-gc-and-classloading:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-128-reg-spill-on-implicit-nullcheck:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-129-ThreadGetId:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-132-daemon-locks-shutdown:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-133-static-invoke-super:enable:true"/>
- <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-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"/>
- <option name="compatibility:module-arg" value="art-run-test-159-app-image-fields:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-163-app-image-methods:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-165-lock-owner-proxy:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-168-vmstack-annotated:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-170-interface-init:enable:true"/>
- <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-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"/>
- <option name="compatibility:module-arg" value="art-run-test-2019-constantcalculationsinking:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-202-thread-oome:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-2020-InvokeVirtual-Inlining:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-2021-InvokeStatic-Inlining:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-2022-Invariantloops:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-2023-InvariantLoops_typecast:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-2024-InvariantNegativeLoop:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-2025-ChangedArrayValue:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-2026-DifferentMemoryLSCouples:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-2027-TwiceTheSameMemoryCouple:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-2028-MultiBackward:enable:true"/>
- <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-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-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"/>
- <option name="compatibility:module-arg" value="art-run-test-304-method-tracing:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-401-optimizing-compiler:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-402-optimizing-control-flow:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-403-optimizing-long:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-404-optimizing-allocator:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-405-optimizing-long-allocator:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-406-fields:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-407-arrays:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-408-move-bug:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-409-materialized-condition:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-410-floats:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-411-checker-hdiv-hrem-pow2:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-411-checker-instruct-simplifier-hrem:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-411-optimizing-arith:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-413-regalloc-regression:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-414-static-fields:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-418-const-string:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-419-long-parameter:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-420-const-class:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-421-exceptions:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-421-large-frame:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-422-instanceof:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-422-type-conversion:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-423-invoke-interface:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-424-checkcast:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-426-monitor:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-427-bitwise:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-427-bounds:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-429-ssa-builder:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-430-live-register-slow-path:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-433-gvn:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-434-shifter-operand:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-435-try-finally-without-catch:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-436-rem-float:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-436-shift-constant:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-437-inline:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-438-volatile:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-439-npe:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-439-swap-double:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-440-stmp:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-441-checker-inliner:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-443-not-bool-inline:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-444-checker-nce:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-445-checker-licm:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-446-checker-inliner2:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-447-checker-inliner3:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-449-checker-bce-rem:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-451-regression-add-float:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-451-spill-splot:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-455-checker-gvn:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-456-baseline-array-set:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-458-long-to-fpu:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-464-checker-inline-sharpen-calls:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-465-checker-clinit-gvn:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-469-condition-materialization:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-470-huge-method:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-471-deopt-environment:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-472-type-propagation:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-473-checker-inliner-constants:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-473-remove-dead-block:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-474-checker-boolean-input:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-474-fp-sub-neg:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-475-simplify-mul-zero:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-476-checker-ctor-memory-barrier:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-476-clinit-inline-static-invoke:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-477-checker-bound-type:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-477-long-2-float-convers-precision:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-478-checker-inline-noreturn:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-478-checker-inliner-nested-loop:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-479-regression-implicit-null-check:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-480-checker-dead-blocks:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-481-regression-phi-cond:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-483-dce-block:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-485-checker-dce-switch:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-486-checker-must-do-null-check:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-487-checker-inline-calls:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-488-checker-inline-recursive-calls:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-489-current-method-regression:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-490-checker-inline:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-491-current-method:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-492-checker-inline-invoke-interface:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-493-checker-inline-invoke-interface:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-494-checker-instanceof-tests:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-495-checker-checkcast-tests:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-496-checker-inlining-class-loader:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-499-bce-phi-array-length:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-500-instanceof:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-505-simplifier-type-propagation:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-507-boolean-test:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-507-referrer:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-508-checker-disassembly:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-508-referrer-method:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-513-array-deopt:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-514-shifts:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-519-bound-load-class:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-521-checker-array-set-null:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-521-regression-integer-field-set:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-524-boolean-simplifier-regression:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-525-checker-arrays-fields1:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-525-checker-arrays-fields2:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-526-long-regalloc:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-527-checker-array-access-simd:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-527-checker-array-access-split:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-528-long-hint:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-529-long-split:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-530-checker-loops1:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-530-checker-loops2:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-530-checker-loops3:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-530-checker-loops4:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-530-checker-loops5:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-530-checker-lse-ctor-fences:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-530-checker-lse-simd:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-530-instanceof-checkcast:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-532-checker-nonnull-arrayset:enable:true"/>
- <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-537-checker-arraycopy: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"/>
- <option name="compatibility:module-arg" value="art-run-test-542-bitfield-rotates:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-542-inline-trycatch:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-542-unresolved-access-check:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-545-tracing-and-jit:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-548-checker-inlining-and-dce:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-549-checker-types-merge:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-550-checker-multiply-accumulate:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-550-new-instance-clinit:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-551-checker-clinit:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-551-implicit-null-checks:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-552-checker-x86-avx2-bit-manipulation:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-554-checker-rtp-checkcast:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-557-checker-instruct-simplifier-ror:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-558-switch:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-559-bce-ssa:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-559-checker-rtp-ifnotnull:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-560-packed-switch:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-561-divrem:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-561-shared-slowpaths:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-562-bce-preheader:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-563-checker-invoke-super:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-564-checker-bitcount:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-564-checker-inline-loop:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-564-checker-negbitwise:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-565-checker-condition-liveness:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-566-checker-codegen-select:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-567-checker-builder-intrinsics:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-568-checker-onebit:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-570-checker-select:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-572-checker-array-get-regression:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-573-checker-checkcast-regression:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-576-polymorphic-inlining:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-577-checker-fp2int:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-578-bce-visit:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-578-polymorphic-inlining:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-579-inline-infinite:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-580-checker-round:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-580-crc32:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-581-rtp:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-582-checker-bce-length:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-584-checker-div-bool:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-589-super-imt:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-590-checker-arr-set-null-regression:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-591-checker-regression-dead-loop:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-593-checker-long-2-float-regression:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-594-checker-array-alias:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-594-load-string-regression:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-603-checker-instanceof:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-605-new-string-from-bytes:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-607-daemon-stress:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-609-checker-inline-interface:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-609-checker-x86-bounds-check:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-610-arraycopy:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-611-checker-simplify-if:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-614-checker-dump-constant-location:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-615-checker-arm64-store-zero:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-617-clinit-oome:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-618-checker-induction:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-619-checker-current-method:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-620-checker-bce-intrinsics:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-622-checker-bce-regressions:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-625-checker-licm-regressions:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-627-checker-unroll:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-628-vdex:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-631-checker-get-class:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-632-checker-char-at-bounds:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-635-checker-arm64-volatile-load-cc:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-636-arm64-veneer-pool:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-637-checker-throw-inline:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-640-checker-boolean-simd:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-640-checker-integer-valueof:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-640-checker-simd:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-641-checker-arraycopy:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-641-iterations:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-643-checker-bogus-ic:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-645-checker-abs-simd:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-646-checker-arraycopy-large-cst-pos:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-646-checker-long-const-to-int:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-646-checker-simd-hadd:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-650-checker-inline-access-thunks:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-654-checker-periodic:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-655-checker-simd-arm-opt:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-656-checker-simd-opt:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-657-branches:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-658-fp-read-barrier:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-660-checker-sad:enable:true"/>
- <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-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"/>
- <option name="compatibility:module-arg" value="art-run-test-667-out-of-bounds:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-669-checker-break:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-671-npe-field-opts:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-672-checker-throw-method:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-673-checker-throw-vmethod:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-674-HelloWorld-Dm:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-676-proxy-jit-at-first-use:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-677-fsi2:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-680-sink-regression:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-684-checker-simd-dotprod:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-684-select-condition:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-689-multi-catch:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-694-clinit-jit:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-695-simplify-throws:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-696-loop:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-697-checker-string-append:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-698-selects:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-700-LoadArgRegs:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-703-floating-point-div:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-704-multiply-accumulate:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-705-register-conflict:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-711-checker-type-conversion:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-718-zipfile-finalizer:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-721-osr:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-726-array-store:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-730-checker-inlining-super:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-805-TooDeepClassInstanceOf:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-806-TooWideClassInstanceOf:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-812-recursive-default:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-814-large-field-offsets:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-815-invokeinterface-default:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-818-clinit-nterp:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-821-madvise-willneed:enable:true"/>
- <option name="compatibility:module-arg" value="art-run-test-963-default-range-smali: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_libdexfile_support_tests:enable:true"/>
- <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_odrefresh_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_runtime_compiler_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"/>
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-01.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-01.xml
deleted file mode 100644
index 06c96e7..0000000
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-01.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by `regen-test-files`. Do not edit manually. -->
-<!-- Copyright (C) 2020 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="List of ART MTS tests that do not need root access (shard 01)">
- <!-- CTS Libcore non-OJ tests. -->
- <option name="compatibility:include-filter" value="CtsLibcoreTestCases"/>
- <!-- Enable MainlineTestModuleController for CTS Libcore non-OJ tests. -->
- <option name="compatibility:module-arg" value="CtsLibcoreTestCases:enable:true"/>
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-02.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-02.xml
deleted file mode 100644
index a7d6278..0000000
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-02.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by `regen-test-files`. Do not edit manually. -->
-<!-- Copyright (C) 2021 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 ART MTS tests that do not need root access (shard 02)">
- <!-- CTS Libcore OJ tests. -->
- <option name="compatibility:include-filter" value="CtsLibcoreApiEvolutionTestCases"/>
- <option name="compatibility:include-filter" value="CtsLibcoreFileIOTestCases"/>
- <option name="compatibility:include-filter" value="CtsLibcoreJsr166TestCases"/>
- <option name="compatibility:include-filter" value="CtsLibcoreLegacy22TestCases"/>
- <option name="compatibility:include-filter" value="CtsLibcoreOjTestCases"/>
- <option name="compatibility:include-filter" value="CtsLibcoreWycheproofBCTestCases"/>
- <option name="compatibility:include-filter" value="MtsLibcoreOkHttpTestCases"/>
- <!-- Enable MainlineTestModuleController for CTS Libcore OJ tests. -->
- <option name="compatibility:module-arg" value="CtsLibcoreApiEvolutionTestCases:enable:true"/>
- <option name="compatibility:module-arg" value="CtsLibcoreFileIOTestCases:enable:true"/>
- <option name="compatibility:module-arg" value="CtsLibcoreJsr166TestCases:enable:true"/>
- <option name="compatibility:module-arg" value="CtsLibcoreLegacy22TestCases:enable:true"/>
- <option name="compatibility:module-arg" value="CtsLibcoreOjTestCases:enable:true"/>
- <option name="compatibility:module-arg" value="CtsLibcoreWycheproofBCTestCases:enable:true"/>
- <option name="compatibility:module-arg" value="MtsLibcoreOkHttpTestCases:enable:true"/>
-</configuration>
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
deleted file mode 100644
index 038d477..0000000
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generated by `regen-test-files`. Do not edit manually. -->
-<!-- Copyright (C) 2020 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="List of ART MTS tests that do not need root access.">
- <include name="mts-art-tests-list-user-shard-00"/>
- <include name="mts-art-tests-list-user-shard-01"/>
- <include name="mts-art-tests-list-user-shard-02"/>
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art.xml b/tools/mts-tradefed/res/config/mts-art.xml
deleted file mode 100644
index e45220e..0000000
--- a/tools/mts-tradefed/res/config/mts-art.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Run mts-art from a preexisting MTS installation.">
-
- <include name="mts" />
-
- <include name="mts-art-tests-list-user" />
- <include name="mts-art-tests-list-eng-only" />
-
- <option name="plan" value="mts-art" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-cronet.xml b/tools/mts-tradefed/res/config/mts-cronet.xml
deleted file mode 100644
index 0b6425e..0000000
--- a/tools/mts-tradefed/res/config/mts-cronet.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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-dns-resolver.xml b/tools/mts-tradefed/res/config/mts-dns-resolver.xml
new file mode 100644
index 0000000..0bab71c
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-dns-resolver.xml
@@ -0,0 +1,26 @@
+<?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-Dns-Resolver from a pre-existing MTS installation">
+
+ <include name="mts" />
+
+ <option name="plan" value="mts-dns-resolver" />
+
+ <option name="compatibility:module-metadata-include-filter" key="component" value="networking" />
+ <option name="compatibility:include-filter" value="CtsNetTestCases android.net.cts.DnsTest" />
+ <option name="compatibility:include-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest" />
+ <option name="compatibility:include-filter" value="CtsNativeNetDnsTestCases" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-documentsUI.xml b/tools/mts-tradefed/res/config/mts-documentsUI.xml
index 218445e..12349a6 100644
--- a/tools/mts-tradefed/res/config/mts-documentsUI.xml
+++ b/tools/mts-tradefed/res/config/mts-documentsUI.xml
@@ -19,7 +19,5 @@
<include name="mts-documentsUI-tests-list" />
- <include name="mts-documentsUI-usedapi-tests-list" />
-
<option name="plan" value="mts-documentsUI" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-exclude.xml b/tools/mts-tradefed/res/config/mts-exclude.xml
index a0c4b27..4b1307a 100644
--- a/tools/mts-tradefed/res/config/mts-exclude.xml
+++ b/tools/mts-tradefed/res/config/mts-exclude.xml
@@ -154,13 +154,28 @@
<!-- b/142978584: Flaky test -->
<option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.TrafficStatsTest#testTrafficStatsForLocalhost" />
+ <!-- https://b.corp.google.com/hotlists/2163903 Flaky test for DNS resolver-->
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testRawQueryInline" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testPrivateDnsBypass" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testRawQueryNXDomainInlineWithPrivateDns" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testRawQueryRootInline" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testRawQueryRoot" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testQueryForInetAddressInline" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsTest#testDnsWorks" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testRawQueryNXDomainInlineWithPrivateDns" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testQueryForInetAddressIpv4" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testContinuousQueries" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testContinuousQueriesInline" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testRawQueryNXDomainWithPrivateDns" />
+ <option name="compatibility:exclude-filter" value="CtsNetTestCases android.net.cts.DnsResolverTest#testRawQueryNXDomain" />
+
<!-- b/148478158, b/148478370, b/148476965 Flaky test for Conscrypt-->
<option name="compatibility:exclude-filter" value="CtsLibcoreOjTestCases test.java.time.chrono.TestJapaneseChronoImpl#test_dayOfYearVsCalendar" />
<option name="compatibility:exclude-filter" value="CtsLibcoreOjTestCases tck.java.time.chrono.TCKJapaneseChronology#test_getDayOfYear" />
<option name="compatibility:exclude-filter" value="CtsLibcoreTestCases org.apache.harmony.tests.javax.net.ssl.SSLSocketTest#testConstructor_InetAddressI" />
<!-- https://b.corp.google.com/hotlists/2163643 Flaky test for statsd-->
- <option name="compatibility:exclude-filter" value="CtsStatsdAtomHostTestCases android.cts.statsdatom.appops.AppOpsTests#testAppOps" />
+ <option name="compatibility:exclude-filter" value="CtsStatsdHostTestCases android.cts.statsd.atom.UidAtomTests#testAppOps" />
<option name="compatibility:exclude-filter" value="CtsStatsdHostTestCases android.cts.statsd.atom.UidAtomTests$#testForegroundServiceAccessAppOp" />
<option name="compatibility:exclude-filter" value="CtsStatsdHostTestCases android.cts.statsd.atom.UidAtomTests#testMobileBytesTransfer" />
<option name="compatibility:exclude-filter" value="CtsStatsdHostTestCases android.cts.statsd.atom.UidAtomTests#testMobileBytesTransferByFgBg" />
@@ -251,9 +266,5 @@
<!-- b/3403706: SQLite JDBC is unsupported -->
<option name="compatibility:exclude-filter" value="MtsConscryptTestCases org.apache.harmony.tests.javax.net.ssl.TrustManagerFactory1Test#test_initLjavax_net_ssl_ManagerFactoryParameters" />
<option name="compatibility:exclude-filter" value="MtsConscryptFdSocketTestCases org.apache.harmony.tests.javax.net.ssl.TrustManagerFactory1Test#test_initLjavax_net_ssl_ManagerFactoryParameters" />
-
- <!-- HostnameVerifierTest assumes latest security patches installed, not always true for MTS: b/182957352 -->
- <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" />
</configuration>
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 3db2066..e4c8029 100644
--- a/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-extservices-tests-list.xml
@@ -33,9 +33,6 @@
<option name="compatibility:include-filter" value="libtextclassifier_tests" />
<option name="compatibility:include-filter" value="libtextclassifier_java_tests" />
- <!-- for Displayhash native -->
- <option name="compatibility:include-filter" value="libextservices_test" />
-
<!-- Enable MainlineTestModuleController. -->
<option name="compatibility:module-arg" value="CtsPackageWatchdogTestCases:enable:true" />
<option name="compatibility:module-arg" value="CtsTextClassifierTestCases:enable:true" />
@@ -44,6 +41,5 @@
<option name="compatibility:module-arg" value="TextClassifierServiceTest:enable:true" />
<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" />
</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 a39efd1..b3a4d4d 100644
--- a/tools/mts-tradefed/res/config/mts-media-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-media-tests-list.xml
@@ -15,11 +15,8 @@
-->
<configuration description="List MTS media tests">
<option name="compatibility:include-filter" value="CtsMediaTestCases" />
- <option name="compatibility:include-filter" value="CtsMediaV2TestCases" />
- <option name="compatibility:include-filter" value="CtsMediaParserTestCases" />
<option name="compatibility:include-filter" value="CtsMediaStressTestCases" />
- <option name="compatibility:include-filter" value="CtsMediaTranscodingTestCases" />
- <option name="compatibility:include-filter" value="Mpeg4H263DecoderTest" />
+ <option name="compatibility:include-filter" value="CtsMediaParserTestCases" />
<!--b/138964734-->
<option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.MediaCodecCapabilitiesTest#testGetMaxSupportedInstances" />
@@ -35,14 +32,10 @@
<!-- Exclude tests that are not related to media mainlines -->
<option name="compatibility:module-arg" value="CtsMediaTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
<option name="compatibility:module-arg" value="CtsMediaStressTestCases:exclude-annotation:android.mediastress.cts.NonMediaMainlineTest" />
- <option name="compatibility:module-arg" value="CtsMediaV2TestCases:exclude-annotation:android.mediav2.cts.NonMediaMainlineTest" />
<!-- Advertise the test suite to media cts. -->
<option name="compatibility:module-arg" value="CtsMediaTestCases:instrumentation-arg:mts-media:=true" />
- <!-- Run media v2 tests for codec names starting with c2.android. -->
- <option name="compatibility:module-arg" value="CtsMediaV2TestCases:instrumentation-arg:codec-prefix:=c2.android." />
-
<!-- Unit tests dynamically download test media -->
<option name="compatibility:enable-module-dynamic-download" value="true" />
diff --git a/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml
index 559ff7d..db35e32 100644
--- a/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-mediaprovider-tests-list-user.xml
@@ -21,8 +21,6 @@
<option name="compatibility:include-filter" value="CtsScopedStorageDeviceOnlyTest" />
<!-- TODO(b/184232207) Enable CtsScopedStoragePublicVolumeHostTest in MTS when it is stable -->
<!-- <option name="compatibility:include-filter" value="CtsScopedStoragePublicVolumeHostTest" /> -->
- <!-- TODO(b/191945329) Enable when CtsAppCloningHostTest is stable in MTS-->
- <!-- <option name="compatibility:include-filter" value="CtsAppCloningHostTest" />-->
<option name="compatibility:include-filter" value="MediaProviderTests" />
<!-- Enable Mediaprovider MTS tests to use MainlineTestModuleController -->
@@ -31,7 +29,6 @@
<option name="compatibility:module-arg" value="CtsScopedStorageHostTest:enable:true" />
<option name="compatibility:module-arg" value="CtsScopedStorageDeviceOnlyTest:enable:true" />
<!-- <option name="compatibility:module-arg" value="CtsScopedStoragePublicVolumeHostTest:enable:true" /> -->
- <!-- <option name="compatibility:module-arg" value="CtsAppCloningHostTest:enable:true" />-->
<option name="compatibility:module-arg" value="MediaProviderTests:enable:true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-metrics-tests-list.xml b/tools/mts-tradefed/res/config/mts-metrics-tests-list.xml
deleted file mode 100644
index 5f9ca6f..0000000
--- a/tools/mts-tradefed/res/config/mts-metrics-tests-list.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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="List mts metrics tests that do not need root access">
- <option name="compatibility:include-filter" value="TrainInstallWithManualRebootSuccessTest" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-metrics.xml b/tools/mts-tradefed/res/config/mts-metrics.xml
deleted file mode 100644
index 70740a0..0000000
--- a/tools/mts-tradefed/res/config/mts-metrics.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<configuration description="Runs MTS-metrics from a pre-existing MTS installation">
-
- <include name="mts" />
-
- <include name="mts-metrics-tests-list" />
-
- <option name="plan" value="mts-metrics" />
-</configuration>
-
diff --git a/tools/mts-tradefed/res/config/mts-network-tests-list.xml b/tools/mts-tradefed/res/config/mts-network-tests-list.xml
index 5b79c25..ead9421 100644
--- a/tools/mts-tradefed/res/config/mts-network-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-network-tests-list.xml
@@ -15,6 +15,5 @@
-->
<configuration description="List MTS network tests.">
<option name="compatibility:include-filter" value="CtsNetTestCasesLatestSdk" />
- <option name="compatibility:module-arg" value="CtsNetTestCasesLatestSdk:exclude-annotation:com.android.testutils.ConnectivityModuleTest" />
</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 e9b8472..1d252cb 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
@@ -17,14 +17,13 @@
-->
<configuration description="List MTS permission tests for OEM.">
- <option name="compatibility:include-filter" value="PermissionApexTests" />
<option name="compatibility:include-filter" value="PermissionControllerMockingTests" />
<option name="compatibility:include-filter" value="PermissionControllerOutOfProcessTests" />
<option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.BackgroundPermissionsTest" />
- <option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.LocationAccessCheckTest" />
+ <!-- TODO(b/153907603): LocationAccessCheckTest clears package data for PermissionController which will interfere with coverage collection. -->
+ <!--<option name="compatibility:include-filter" value="CtsPermissionTestCases android.permission.cts.LocationAccessCheckTest" />-->
<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" />
<option name="compatibility:module-arg" value="CtsPermissionTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
<option name="compatibility:include-filter" value="CtsPermission3TestCases" />
<option name="compatibility:module-arg" value="CtsPermission3TestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
@@ -34,10 +33,7 @@
<option name="compatibility:module-arg" value="CtsDevicePolicyManagerTestCases:include-annotation:com.android.cts.devicepolicy.annotations.PermissionsTest" />
<option name="compatibility:module-arg" value="CtsDevicePolicyManagerTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
<option name="compatibility:include-filter" value="CtsOsTestCases android.os.cts.AutoRevokeTest" />
- <option name="compatibility:include-filter" value="CtsOsTestCases android.os.cts.AppHibernationIntegrationTest" />
<option name="compatibility:module-arg" value="CtsOsTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
<option name="compatibility:include-filter" value="CtsRoleTestCases" />
<option name="compatibility:module-arg" value="CtsRoleTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
- <option name="compatibility:include-filter" value="GtsIncidentManagerTestCases" />
- <option name="compatibility:module-arg" value="GtsIncidentManagerTestCases:exclude-annotation:android.platform.test.annotations.FlakyTest" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-scheduling-tests-list.xml b/tools/mts-tradefed/res/config/mts-scheduling-tests-list.xml
deleted file mode 100644
index a61a756..0000000
--- a/tools/mts-tradefed/res/config/mts-scheduling-tests-list.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2021 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="MTS test list for Device Scheduling">
-
- <option name="compatibility:include-filter" value="CtsRebootReadinessTestCases" />
- <option name="compatibility:include-filter" value="RebootReadinessUnitTests" />
-
- <!-- Enable Device Scheduling MTS tests to use MainlineTestModuleController -->
- <option name="compatibility:module-arg" value="CtsRebootReadinessTestCases:enable:true" />
- <option name="compatibility:module-arg" value="RebootReadinessUnitTests:enable:true" />
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-scheduling.xml b/tools/mts-tradefed/res/config/mts-scheduling.xml
deleted file mode 100644
index ad7fbbd..0000000
--- a/tools/mts-tradefed/res/config/mts-scheduling.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2021 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-scheduling from a pre-existing MTS installation">
-
- <include name="mts" />
-
- <option name="plan" value="mts-scheduling" />
-
- <include name="mts-scheduling-tests-list" />
-
-</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-sdkextensions-tests-list.xml b/tools/mts-tradefed/res/config/mts-sdkextensions-tests-list.xml
index 51a93bc..f944269 100644
--- a/tools/mts-tradefed/res/config/mts-sdkextensions-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-sdkextensions-tests-list.xml
@@ -15,11 +15,9 @@
-->
<configuration description="Runs MTS-sdkextensions from a pre-existing MTS installation">
- <option name="compatibility:include-filter" value="CtsClasspathsTestCases" />
<option name="compatibility:include-filter" value="CtsSdkExtensionsTestCases" />
<!-- Enable SdkExtensions MTS tests to use MainlineTestModuleController -->
- <option name="compatibility:module-arg" value="CtsClasspathsTestCases:enable:true" />
<option name="compatibility:module-arg" value="CtsSdkExtensionsTestCases:enable:true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-statsd-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-statsd-tests-list-eng-only.xml
index 49d7649..0712910 100644
--- a/tools/mts-tradefed/res/config/mts-statsd-tests-list-eng-only.xml
+++ b/tools/mts-tradefed/res/config/mts-statsd-tests-list-eng-only.xml
@@ -18,10 +18,14 @@
<option name="compatibility:include-filter" value="libstatspull_test" />
<option name="compatibility:include-filter" value="libstatssocket_test" />
+ <!-- Include libincident tests -->
+ <option name="compatibility:include-filter" value="libincident_test" />
+
<!-- Include tests from statsd native device-tests -->
<option name="compatibility:include-filter" value="statsd_test" />
<!-- Enable MainlineTestModuleController. -->
+ <option name="compatibility:module-arg" value="libincident_test:enable:true" />
<option name="compatibility:module-arg" value="libstatspull_test:enable:true" />
<option name="compatibility:module-arg" value="libstatssocket_test:enable:true" />
<option name="compatibility:module-arg" value="statsd_test:enable:true" />
diff --git a/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml
index db4880b..c6adb13 100644
--- a/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-statsd-tests-list-user.xml
@@ -16,7 +16,7 @@
<configuration description="List of statsd MTS tests that do not need root access.">
<!-- Include tests from CTS -->
<option name="compatibility:include-filter" value="CtsStatsdHostTestCases" />
- <option name="compatibility:include-filter" value="CtsUtilTestCases android.util.cts.AndroidExceptionTest#testAndroidException" />
+ <option name="compatibility:include-filter" value="CtsUtilTestCases" />
<!-- Include tests from Statsd Framework Apex -->
<option name="compatibility:include-filter" value="FrameworkStatsdTest" />
diff --git a/tools/mts-tradefed/res/config/mts-telephony.xml b/tools/mts-tradefed/res/config/mts-telephony.xml
deleted file mode 100644
index f2e38ae..0000000
--- a/tools/mts-tradefed/res/config/mts-telephony.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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-telephony from a pre-existing MTS installation">
-
- <include name="mts" />
- <include name="mts-exclude" />
-
- <option name="plan" value="mts-telephony" />
- <option name="compatibility:include-filter" value="FrameworksTelephonyTests" />
- <option name="compatibility:include-filter" value="ImsCommonTests" />
- <option name="compatibility:include-filter" value="CtsSimRestrictedApisTestCases" />
- <option name="compatibility:include-filter" value="CtsTelephony3TestCases" />
- <option name="compatibility:include-filter" value="CtsTelephony2TestCases" />
- <option name="compatibility:include-filter" value="CtsTelephonySdk28TestCases" />
- <option name="compatibility:include-filter" value="CtsTelephonyTestCases" />
-
- <!-- TODO: Uncomment this after the instrumentation signature issue is resolved:
- MTS runs on goog/dev-keys signed devices, but MTS is built with aosp/test-keys so
- instrumentation doesn't work properly. Solution is pending, either a short term solution
- based on adding a new MTS target in vendor/unbundled_google or something else the
- release team cooks up.
- <option name="compatibility:include-filter" value="TeleServiceTests" />
- -->
- <option name="compatibility:primary-abi-only" value="true" />
-</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 bc1b18e..8b2f35c 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
@@ -14,11 +14,10 @@
limitations under the License.
-->
<configuration description="List tests that need root access.">
- <include name="mts-adbd-tests-list-eng-only" />
- <include name="mts-art-tests-list-eng-only" />
<include name="mts-dnsresolver-tests-list-eng-only" />
- <include name="mts-documentsUI-usedapi-tests-list-eng-only" />
+ <include name="mts-adbd-tests-list-eng-only" />
<include name="mts-mediaprovider-tests-list-eng-only" />
<include name="mts-statsd-tests-list-eng-only" />
+ <include name="mts-documentsUI-usedapi-tests-list-eng-only" />
</configuration>
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 472bd69..36f1b40 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
@@ -14,13 +14,12 @@
limitations under the License.
-->
<configuration description="List all tests that do not need root access in active test plans.">
- <include name="mts-art-tests-list-user" />
<include name="mts-cellbroadcast-oem-tests-list" />
<include name="mts-conscrypt-tests-list" />
<include name="mts-core-tests-list" />
- <include name="mts-dnsresolver-tests-list-user" />
<include name="mts-documentsUI-oem-tests-list" />
<include name="mts-documentsUI-usedapi-tests-list" />
+ <include name="mts-dnsresolver-tests-list-user" />
<include name="mts-extservices-tests-list" />
<include name="mts-ipsec-tests-list" />
<include name="mts-media-tests-list" />
@@ -29,7 +28,6 @@
<include name="mts-neuralnetworks-tests-list" />
<include name="mts-permission-tests-list-oem" />
<include name="mts-preload-verify-tests-list" />
- <include name="mts-scheduling-tests-list" />
<include name="mts-sdkextensions-tests-list" />
<include name="mts-statsd-tests-list-user" />
<include name="mts-tethering-tests-list" />
@@ -46,8 +44,5 @@
TODO(b/158818152): remove once GTS tests can run on user build -->
<option name="compatibility:exclude-filter" value="GtsStatsdHostTestCases" />
- <!-- Exclude Permission GTS tests that cannot run on user build due to signature mismatch with
- GMSCore
- TODO(b/158818152): remove once GTS tests can run on user build -->
- <option name="compatibility:exclude-filter" value="GtsIncidentManagerTestCases" />
</configuration>
+
diff --git a/tools/mts-tradefed/res/config/mts-tethering-tests-list.xml b/tools/mts-tradefed/res/config/mts-tethering-tests-list.xml
index 913c130..d650f9f 100644
--- a/tools/mts-tradefed/res/config/mts-tethering-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-tethering-tests-list.xml
@@ -15,11 +15,13 @@
-->
<configuration description="List mts tethering tests">
- <option name="compatibility:include-filter" value="MtsTetheringTestLatestSdk" />
- <option name="compatibility:include-filter" value="CtsTetheringTestLatestSdk" />
+ <option name="compatibility:include-filter" value="MtsTetheringTest" />
+ <option name="compatibility:include-filter" value="CtsTetheringTest" />
+ <option name="compatibility:include-filter" value="CtsWifiTestCases" />
<!-- Enable tethering MTS tests to use MainlineTestModuleController -->
- <option name="compatibility:module-arg" value="MtsTetheringTestLatestSdk:enable:true" />
- <option name="compatibility:module-arg" value="CtsTetheringTestLatestSdk:enable:true" />
+ <option name="compatibility:module-arg" value="MtsTetheringTest:enable:true" />
+ <option name="compatibility:module-arg" value="CtsTetheringTest:enable:true" />
+ <option name="compatibility:module-arg" value="CtsWifiTestCases:enable:true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-wifi-oem-tests-list.xml b/tools/mts-tradefed/res/config/mts-wifi-oem-tests-list.xml
index 4162d23..143364b 100644
--- a/tools/mts-tradefed/res/config/mts-wifi-oem-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-wifi-oem-tests-list.xml
@@ -15,14 +15,17 @@
-->
<configuration description="List test modules of WIFI module. This is a placeholder xml instead of a runnable plan.">
-
+ <!-- This test is only run if the Wifi module is installed. It tests for functionality that is
+ not required for devices that don't take the Wifi module. -->
<option name="compatibility:include-filter" value="MtsWifiTestCases" />
+
+ <!-- These tests are run no matter if the Wifi module is installed or not, since these are
+ CTS/GTS tests that should pass regardless.
+ Note: Gating these tests by whether the Wifi Module is installed will gate their entire
+ test suites, which is not desirable since other tests in the suite are used to qualify
+ mandatory modules. -->
<option name="compatibility:include-filter" value="CtsWifiTestCases" />
<option name="compatibility:include-filter" value="CtsNetTestCasesLatestSdk" />
- <!-- Do not include Connectivity (tethering) module-specific tests as Wifi MTS may not run
- with the latest version of that module installed -->
- <option name="compatibility:module-arg"
- value="CtsNetTestCasesLatestSdk:exclude-annotation:com.android.testutils.ConnectivityModuleTest" />
<option name="compatibility:include-filter"
value="GtsGmscoreHostTestCases com.google.android.gts.wifi.WifiHostTest" />
<option name="compatibility:include-filter"
@@ -32,9 +35,8 @@
<option name="compatibility:include-filter"
value="GtsBackupHostTestCases com.google.android.gts.backup.WifiSettingsRestoreHostSideTest" />
- <!-- Enable WIFI MTS tests to use MainlineTestModuleController -->
+ <!-- Enable MainlineTestModuleController for Wifi MTS-only tests -->
<option name="compatibility:module-arg" value="MtsWifiTestCases:enable:true" />
<option name="compatibility:module-arg" value="GtsBackupHostTestCases:enable:true" />
<option name="compatibility:module-arg" value="GtsGmscoreHostTestCases:enable:true" />
- <option name="compatibility:module-arg" value="CtsWifiTestCases:enable:true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts.xml b/tools/mts-tradefed/res/config/mts.xml
index 8180e81..35d0a08 100644
--- a/tools/mts-tradefed/res/config/mts.xml
+++ b/tools/mts-tradefed/res/config/mts.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Runs all the tests in MTS">
+<configuration description="Runs MTS">
<include name="everything" />
<option name="plan" value="mts" />
diff --git a/tools/mts-tradefed/tests/Android.bp b/tools/mts-tradefed/tests/Android.bp
index 8d7893d..f0db0fc 100644
--- a/tools/mts-tradefed/tests/Android.bp
+++ b/tools/mts-tradefed/tests/Android.bp
@@ -13,10 +13,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
java_library_host {
name: "mts-tradefed-tests",
