Snap for 8857240 from b068b9e2e742b9a355c7036502843324623dcd98 to mainline-go-uwb-release
Change-Id: I08d2936e9c8fe7dadb22a0c23e04951d842de5bf
diff --git a/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml b/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
index 6cbc8ad..b2701ef 100644
--- a/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
@@ -30,7 +30,7 @@
<option name="compatibility:include-filter"
value="SdkSandboxManagerServiceUnitTests" />
<option name="compatibility:include-filter"
- value="SdkSandboxTests" />
+ value="SdkSandboxUnitTests" />
<option name="compatibility:module-arg" value="CtsAdServicesDeviceTestCases:enable:true" />
<option name="compatibility:module-arg" value="CtsAdServicesDebuggableDeviceTestCases:enable:true" />
@@ -41,5 +41,5 @@
<option name="compatibility:module-arg" value="SdkSandboxManagerTests:enable:true" />
<option name="compatibility:module-arg" value="CtsSdkSandboxInprocessTests:enable:true" />
<option name="compatibility:module-arg" value="SdkSandboxManagerServiceUnitTests:enable:true" />
- <option name="compatibility:module-arg" value="SdkSandboxTests:enable:true" />
+ <option name="compatibility:module-arg" value="SdkSandboxUnitTests:enable:true" />
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-shard-03.xml b/tools/mts-tradefed/res/config/mts-art-shard-03.xml
new file mode 100644
index 0000000..d36225d
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-art-shard-03.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by `regen-test-files`. Do not edit manually. -->
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Run mts-art-shard-03 from a preexisting MTS installation.">
+ <include name="mts"/>
+ <include name="mts-art-tests-list-user-shard-03"/>
+ <option name="plan" value="mts-art-shard-03"/>
+</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
index 72c1f6c..eeeb56c 100644
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-00.xml
@@ -424,24 +424,6 @@
<option name="compatibility:include-filter" value="art-run-test-834-lse"/>
<option name="compatibility:include-filter" value="art-run-test-835-b216762268"/>
<option name="compatibility:include-filter" value="art-run-test-963-default-range-smali"/>
- <option name="compatibility:include-filter" value="art_libnativebridge_cts_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_cmdline_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_compiler_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_dex2oat_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_dexdump_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_dexlist_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_libartbase_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_libartpalette_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_libartservice_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_libarttools_tests"/>
- <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_runtime_compiler_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_runtime_tests"/>
- <option name="compatibility:include-filter" value="art_standalone_sigchain_tests"/>
- <option name="compatibility:include-filter" value="libnativeloader_test"/>
<!-- Enable MainlineTestModuleController for ART 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"/>
@@ -851,22 +833,4 @@
<option name="compatibility:module-arg" value="art-run-test-834-lse:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-835-b216762268:enable:true"/>
<option name="compatibility:module-arg" value="art-run-test-963-default-range-smali:enable:true"/>
- <option name="compatibility:module-arg" value="art_libnativebridge_cts_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_cmdline_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_compiler_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_dex2oat_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_dexdump_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_dexlist_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_libartbase_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_libartpalette_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_libartservice_tests:enable:true"/>
- <option name="compatibility:module-arg" value="art_standalone_libarttools_tests:enable:true"/>
- <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_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"/>
- <option name="compatibility:module-arg" value="libnativeloader_test:enable:true"/>
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-03.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-03.xml
new file mode 100644
index 0000000..58fbe71
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-user-shard-03.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by `regen-test-files`. Do not edit manually. -->
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="List of ART MTS tests that do not need root access (shard 03)">
+ <!-- ART gtests. -->
+ <option name="compatibility:include-filter" value="art_libnativebridge_cts_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_cmdline_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_compiler_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_dex2oat_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_dexdump_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_dexlist_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_libartbase_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_libartpalette_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_libartservice_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_libarttools_tests"/>
+ <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_runtime_compiler_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_runtime_tests"/>
+ <option name="compatibility:include-filter" value="art_standalone_sigchain_tests"/>
+ <option name="compatibility:include-filter" value="libnativeloader_test"/>
+ <!-- Enable MainlineTestModuleController for ART gtests. -->
+ <option name="compatibility:module-arg" value="art_libnativebridge_cts_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_cmdline_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_compiler_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_dex2oat_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_dexdump_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_dexlist_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_libartbase_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_libartpalette_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_libartservice_tests:enable:true"/>
+ <option name="compatibility:module-arg" value="art_standalone_libarttools_tests:enable:true"/>
+ <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_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"/>
+ <option name="compatibility:module-arg" value="libnativeloader_test: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
index 41cec46..16fce14 100644
--- a/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
@@ -18,6 +18,7 @@
<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"/>
+ <include name="mts-art-tests-list-user-shard-03"/>
<!-- Excluded flaky tests (b/209958457). -->
<option name="compatibility:exclude-filter" value="CtsLibcoreFileIOTestCases android.cts.FileChannelInterProcessLockTest#test_lockJJZ_Exclusive_asyncChannel"/>
<option name="compatibility:exclude-filter" value="CtsLibcoreFileIOTestCases android.cts.FileChannelInterProcessLockTest#test_lockJJZ_Exclusive_syncChannel"/>
