Snap for 9241468 from 6794aa83df13dee5976cd28ad65ac038aaa1120d to mainline-wifi-release
Change-Id: I806c5c3dcdada23f712125a60eed1504a340ac16
diff --git a/tools/mts-tradefed/res/config/mts-adservices-cts-only-tests-list.xml b/tools/mts-tradefed/res/config/mts-adservices-cts-only-tests-list.xml
index 8f117a3..f9b12a5 100644
--- a/tools/mts-tradefed/res/config/mts-adservices-cts-only-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-adservices-cts-only-tests-list.xml
@@ -27,6 +27,8 @@
<option name="compatibility:include-filter"
+ value="CtsSdkSandboxHostSideTests" />
+ <option name="compatibility:include-filter"
value="CtsSdkSandboxInprocessTests" />
<option name="compatibility:module-arg" value="CtsAdServicesDeviceTestCases:enable:true" />
@@ -36,5 +38,6 @@
<option name="compatibility:module-arg" value="CtsAdIdEndToEndTest:enable:true" />
<option name="compatibility:module-arg" value="CtsAppSetIdEndToEndTest:enable:true" />
+ <option name="compatibility:module-arg" value="CtsSdkSandboxHostSideTests:enable:true" />
<option name="compatibility:module-arg" value="CtsSdkSandboxInprocessTests:enable:true" />
</configuration>
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 8f4ee9d..8420e97 100644
--- a/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-adservices-tests-list.xml
@@ -38,6 +38,8 @@
<option name="compatibility:include-filter"
value="SdkSandboxManagerTests" />
<option name="compatibility:include-filter"
+ value="CtsSdkSandboxHostSideTests" />
+ <option name="compatibility:include-filter"
value="CtsSdkSandboxInprocessTests" />
<option name="compatibility:include-filter"
value="SdkSandboxManagerServiceUnitTests" />
@@ -58,6 +60,7 @@
<option name="compatibility:module-arg" value="CtsAppSetIdEndToEndTest:enable:true" />
<option name="compatibility:module-arg" value="SdkSandboxManagerTests:enable:true" />
+ <option name="compatibility:module-arg" value="CtsSdkSandboxHostSideTests: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="SdkSandboxUnitTests:enable:true" />
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-shard-00.xml b/tools/mts-tradefed/res/config/mts-bluetooth-shard-00.xml
new file mode 100644
index 0000000..40e4099
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-shard-00.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Runs mts-bluetooth-shard-00 from a pre-existing MTS installation">
+
+ <include name="mts" />
+ <include name="mts-bluetooth-tests-list-shard-00" />
+ <option name="plan" value="mts-bluetooth-shard-00" />
+
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
+ <option name="property-name" value="ro.build.type" />
+ <option name="expected-value" value="userdebug"/> <!-- Device should have userdebug/eng build -->
+ <option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
+ </target_preparer>
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-shard-01.xml b/tools/mts-tradefed/res/config/mts-bluetooth-shard-01.xml
new file mode 100644
index 0000000..3cb28b3
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-shard-01.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Runs mts-bluetooth-shard-01 from a pre-existing MTS installation">
+
+ <include name="mts" />
+ <include name="mts-bluetooth-tests-list-shard-01" />
+ <option name="plan" value="mts-bluetooth-shard-01" />
+
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
+ <option name="property-name" value="ro.build.type" />
+ <option name="expected-value" value="userdebug"/> <!-- Device should have userdebug/eng build -->
+ <option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
+ </target_preparer>
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-shard-02.xml b/tools/mts-tradefed/res/config/mts-bluetooth-shard-02.xml
new file mode 100644
index 0000000..ebcef27
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-shard-02.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="Runs mts-bluetooth-shard-02 from a pre-existing MTS installation">
+
+ <include name="mts" />
+ <include name="mts-bluetooth-tests-list-shard-02" />
+ <option name="plan" value="mts-bluetooth-shard-02" />
+
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
+ <option name="property-name" value="ro.build.type" />
+ <option name="expected-value" value="userdebug"/> <!-- Device should have userdebug/eng build -->
+ <option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
+ </target_preparer>
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-00.xml b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-00.xml
new file mode 100644
index 0000000..1d19960
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-00.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="List of Bluetooth MTS tests that do not need root access (shard 00).">
+ <option name="compatibility:include-filter" value="pts-bot-mts" />
+ <option name="compatibility:module-arg" value="pts-bot-mts:enable:true" />
+</configuration>
\ No newline at end of file
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-01.xml b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-01.xml
new file mode 100644
index 0000000..1ce0778
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-01.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="List of Bluetooth MTS tests that do not need root access (shard 01).">
+ <option name="compatibility:include-filter" value="CtsBluetoothTestCases" />
+ <option name="compatibility:include-filter" value="GoogleFrameworkBluetoothTests" />
+ <option name="compatibility:include-filter" value="GoogleServiceBluetoothTests" />
+ <option name="compatibility:include-filter" value="GoogleBluetoothInstrumentationTests" />
+ <option name="compatibility:module-arg" value="CtsBluetoothTestCases:enable:true" />
+ <option name="compatibility:module-arg" value="GoogleFrameworkBluetoothTests:enable:true" />
+ <option name="compatibility:module-arg" value="GoogleServiceBluetoothTests:enable:true" />
+ <option name="compatibility:module-arg" value="GoogleBluetoothInstrumentationTests:enable:true" />
+</configuration>
\ No newline at end of file
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-02.xml b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-02.xml
new file mode 100644
index 0000000..d8cb36d
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list-shard-02.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration description="List of Bluetooth MTS tests that do not need root access (shard 02).">
+ <option name="compatibility:include-filter" value="net_test_audio_a2dp_hw" />
+ <option name="compatibility:include-filter" value="net_test_audio_hearing_aid_hw" />
+ <option name="compatibility:include-filter" value="net_test_bta" />
+ <option name="compatibility:include-filter" value="bt_host_test_bta" />
+ <option name="compatibility:include-filter" value="net_test_hf_client_add_record" />
+ <option name="compatibility:include-filter" value="bluetooth_csis_test" />
+ <option name="compatibility:include-filter" value="bluetooth_groups_test" />
+ <option name="compatibility:include-filter" value="bluetooth_vc_test" />
+ <option name="compatibility:include-filter" value="bluetooth_le_audio_test" />
+ <option name="compatibility:include-filter" value="bluetooth_le_audio_client_test" />
+ <option name="compatibility:include-filter" value="bluetooth_test_broadcaster" />
+ <option name="compatibility:include-filter" value="bluetooth_has_test" />
+ <option name="compatibility:include-filter" value="net_test_btcore" />
+ <option name="compatibility:include-filter" value="net_test_btif" />
+ <option name="compatibility:include-filter" value="net_test_btif_profile_queue" />
+ <option name="compatibility:include-filter" value="net_test_btif_rc" />
+ <option name="compatibility:include-filter" value="net_test_btif_config_cache" />
+ <option name="compatibility:include-filter" value="net_test_btif_hf_client_service" />
+ <option name="compatibility:include-filter" value="net_test_btif_stack" />
+ <option name="compatibility:include-filter" value="bluetooth_test_common" />
+ <option name="compatibility:include-filter" value="net_test_performance" />
+ <option name="compatibility:include-filter" value="net_test_device" />
+ <option name="compatibility:include-filter" value="bluetooth_test_gd_unit" />
+ <option name="compatibility:include-filter" value="bluetooth_packet_parser_test" />
+ <option name="compatibility:include-filter" value="bluetooth_flatbuffer_tests" />
+ <option name="compatibility:include-filter" value="net_test_hci" />
+ <option name="compatibility:include-filter" value="net_test_hci_native" />
+ <option name="compatibility:include-filter" value="net_test_hci_fragmenter_native" />
+ <option name="compatibility:include-filter" value="net_test_main_shim" />
+ <option name="compatibility:include-filter" value="net_test_osi" />
+ <option name="compatibility:include-filter" value="net_test_btpackets" />
+ <option name="compatibility:include-filter" value="net_test_avrcp" />
+ <option name="compatibility:include-filter" value="bluetooth_test_sdp" />
+ <option name="compatibility:include-filter" value="bluetoothtbd_test" />
+ <option name="compatibility:include-filter" value="net_test_stack" />
+ <option name="compatibility:include-filter" value="net_test_stack_rfcomm" />
+ <option name="compatibility:include-filter" value="net_test_stack_smp" />
+ <option name="compatibility:include-filter" value="net_test_stack_multi_adv" />
+ <option name="compatibility:include-filter" value="net_test_stack_ad_parser" />
+ <option name="compatibility:include-filter" value="net_test_stack_gatt_native" />
+ <option name="compatibility:include-filter" value="net_test_stack_avdtp" />
+ <option name="compatibility:include-filter" value="net_test_stack_a2dp_native" />
+ <option name="compatibility:include-filter" value="net_test_stack_gatt_sr_hash_native" />
+ <option name="compatibility:include-filter" value="net_test_btm_iso" />
+ <option name="compatibility:include-filter" value="net_test_eatt" />
+ <option name="compatibility:include-filter" value="net_test_stack_btm" />
+ <option name="compatibility:include-filter" value="net_test_stack_hci" />
+ <option name="compatibility:include-filter" value="net_test_stack_hid" />
+ <option name="compatibility:include-filter" value="net_test_stack_btu" />
+ <option name="compatibility:include-filter" value="net_test_stack_gatt" />
+ <option name="compatibility:include-filter" value="net_test_stack_l2cap" />
+ <option name="compatibility:include-filter" value="net_test_stack_acl" />
+ <option name="compatibility:include-filter" value="net_test_stack_sdp" />
+ <option name="compatibility:include-filter" value="net_test_bluetooth" />
+ <option name="compatibility:include-filter" value="net_test_types" />
+ <option name="compatibility:module-arg" value="net_test_audio_a2dp_hw:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_audio_hearing_aid_hw:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_bta:enable:true" />
+ <option name="compatibility:module-arg" value="bt_host_test_bta:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_hf_client_add_record:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_csis_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_groups_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_vc_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_le_audio_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_le_audio_client_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_test_broadcaster:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_has_test:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btcore:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btif:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btif_profile_queue:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btif_rc:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btif_config_cache:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btif_hf_client_service:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btif_stack:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_test_common:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_performance:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_device:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_test_gd_unit:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_packet_parser_test:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_flatbuffer_tests:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_hci:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_hci_native:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_hci_fragmenter_native:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_main_shim:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_osi:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btpackets:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_avrcp:enable:true" />
+ <option name="compatibility:module-arg" value="bluetooth_test_sdp:enable:true" />
+ <option name="compatibility:module-arg" value="bluetoothtbd_test:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_rfcomm:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_smp:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_multi_adv:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_ad_parser:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_gatt_native:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_avdtp:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_a2dp_native:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_gatt_sr_hash_native:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_btm_iso:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_eatt:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_btm:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_hci:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_hid:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_btu:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_gatt:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_l2cap:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_acl:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_stack_sdp:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_bluetooth:enable:true" />
+ <option name="compatibility:module-arg" value="net_test_types:enable:true" />
+</configuration>
\ No newline at end of file
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list.xml b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list.xml
index 24955ae..e0b7e80 100644
--- a/tools/mts-tradefed/res/config/mts-bluetooth-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-bluetooth-tests-list.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
+<!-- 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.
@@ -13,137 +13,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="List of stat MTS tests that do not need root access.">
-
- <!-- Include Java test suites -->
- <option name="compatibility:include-filter" value="CtsBluetoothTestCases" />
- <option name="compatibility:include-filter" value="GoogleBluetoothInstrumentationTests" />
-
- <!-- Include native tests -->
- <option name="compatibility:include-filter" value="net_test_audio_a2dp_hw" />
- <option name="compatibility:include-filter" value="net_test_audio_hearing_aid_hw" />
- <option name="compatibility:include-filter" value="net_test_bta" />
- <option name="compatibility:include-filter" value="bt_host_test_bta" />
- <option name="compatibility:include-filter" value="net_test_hf_client_add_record" />
- <option name="compatibility:include-filter" value="bluetooth_csis_test" />
- <option name="compatibility:include-filter" value="bluetooth_groups_test" />
- <option name="compatibility:include-filter" value="bluetooth_vc_test" />
- <option name="compatibility:include-filter" value="bluetooth_le_audio_test" />
- <option name="compatibility:include-filter" value="bluetooth_le_audio_client_test" />
- <option name="compatibility:include-filter" value="bluetooth_test_broadcaster_sm" />
- <option name="compatibility:include-filter" value="bluetooth_test_broadcaster" />
- <option name="compatibility:include-filter" value="bluetooth_has_test" />
- <option name="compatibility:include-filter" value="net_test_btcore" />
- <option name="compatibility:include-filter" value="net_test_btif" />
- <option name="compatibility:include-filter" value="net_test_btif_profile_queue" />
- <option name="compatibility:include-filter" value="net_test_btif_rc" />
- <option name="compatibility:include-filter" value="net_test_btif_config_cache" />
- <option name="compatibility:include-filter" value="net_test_btif_hf_client_service" />
- <option name="compatibility:include-filter" value="net_test_btif_stack" />
- <option name="compatibility:include-filter" value="bluetooth_test_common" />
- <option name="compatibility:include-filter" value="net_test_performance" />
- <option name="compatibility:include-filter" value="net_test_device" />
- <option name="compatibility:include-filter" value="bluetooth_test_gd_unit" />
- <option name="compatibility:include-filter" value="bluetooth_packet_parser_test" />
- <option name="compatibility:include-filter" value="bluetooth_flatbuffer_tests" />
- <option name="compatibility:include-filter" value="net_test_hci" />
- <option name="compatibility:include-filter" value="net_test_hci_native" />
- <option name="compatibility:include-filter" value="net_test_hci_fragmenter_native" />
- <option name="compatibility:include-filter" value="net_test_main_shim" />
- <option name="compatibility:include-filter" value="net_test_osi" />
- <option name="compatibility:include-filter" value="net_test_btpackets" />
- <option name="compatibility:include-filter" value="net_test_avrcp" />
- <option name="compatibility:include-filter" value="bluetooth_test_sdp" />
- <option name="compatibility:include-filter" value="bluetoothtbd_test" />
- <option name="compatibility:include-filter" value="net_test_stack" />
- <option name="compatibility:include-filter" value="net_test_stack_rfcomm" />
- <option name="compatibility:include-filter" value="net_test_stack_smp" />
- <option name="compatibility:include-filter" value="net_test_stack_multi_adv" />
- <option name="compatibility:include-filter" value="net_test_stack_ad_parser" />
- <option name="compatibility:include-filter" value="net_test_stack_gatt_native" />
- <option name="compatibility:include-filter" value="net_test_stack_avdtp" />
- <option name="compatibility:include-filter" value="net_test_stack_a2dp_native" />
- <option name="compatibility:include-filter" value="net_test_stack_gatt_sr_hash_native" />
- <option name="compatibility:include-filter" value="net_test_btm_iso" />
- <option name="compatibility:include-filter" value="net_test_eatt" />
- <option name="compatibility:include-filter" value="net_test_stack_btm" />
- <option name="compatibility:include-filter" value="net_test_stack_hci" />
- <option name="compatibility:include-filter" value="net_test_stack_hid" />
- <option name="compatibility:include-filter" value="net_test_stack_btu" />
- <option name="compatibility:include-filter" value="net_test_stack_gatt" />
- <option name="compatibility:include-filter" value="net_test_stack_l2cap" />
- <option name="compatibility:include-filter" value="net_test_stack_acl" />
- <option name="compatibility:include-filter" value="bt_headless" />
- <option name="compatibility:include-filter" value="net_test_bluetooth" />
- <option name="compatibility:include-filter" value="net_test_types" />
- <option name="compatibility:include-filter" value="libbt_packets_test" />
- <option name="compatibility:include-filter" value="packets_test_rust" />
- <option name="compatibility:include-filter" value="libbluetooth_rs_test" />
-
-
- <!-- Enable MainlineTestModuleController for Java test suites -->
- <option name="compatibility:module-arg" value="CtsBluetoothTestCases:enable:true" />
- <option name="compatibility:module-arg" value="GoogleBluetoothInstrumentationTests:enable:true" />
-
- <!-- Enable MainlineTestModuleController for Native tests -->
- <option name="compatibility:module-arg" value="net_test_audio_a2dp_hw:enable:true" />
- <option name="compatibility:module-arg" value="net_test_audio_hearing_aid_hw:enable:true" />
- <option name="compatibility:module-arg" value="net_test_bta:enable:true" />
- <option name="compatibility:module-arg" value="bt_host_test_bta:enable:true" />
- <option name="compatibility:module-arg" value="net_test_hf_client_add_record:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_csis_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_groups_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_vc_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_le_audio_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_le_audio_client_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_test_broadcaster_sm:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_test_broadcaster:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_has_test:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btcore:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btif:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btif_profile_queue:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btif_rc:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btif_config_cache:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btif_hf_client_service:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btif_stack:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_test_common:enable:true" />
- <option name="compatibility:module-arg" value="net_test_performance:enable:true" />
- <option name="compatibility:module-arg" value="net_test_device:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_test_gd_unit:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_packet_parser_test:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_flatbuffer_tests:enable:true" />
- <option name="compatibility:module-arg" value="net_test_hci:enable:true" />
- <option name="compatibility:module-arg" value="net_test_hci_native:enable:true" />
- <option name="compatibility:module-arg" value="net_test_hci_fragmenter_native:enable:true" />
- <option name="compatibility:module-arg" value="net_test_main_shim:enable:true" />
- <option name="compatibility:module-arg" value="net_test_osi:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btpackets:enable:true" />
- <option name="compatibility:module-arg" value="net_test_avrcp:enable:true" />
- <option name="compatibility:module-arg" value="bluetooth_test_sdp:enable:true" />
- <option name="compatibility:module-arg" value="bluetoothtbd_test:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_rfcomm:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_smp:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_multi_adv:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_ad_parser:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_gatt_native:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_avdtp:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_a2dp_native:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_gatt_sr_hash_native:enable:true" />
- <option name="compatibility:module-arg" value="net_test_btm_iso:enable:true" />
- <option name="compatibility:module-arg" value="net_test_eatt:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_btm:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_hci:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_hid:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_btu:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_gatt:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_l2cap:enable:true" />
- <option name="compatibility:module-arg" value="net_test_stack_acl:enable:true" />
- <option name="compatibility:module-arg" value="bt_headless:enable:true" />
- <option name="compatibility:module-arg" value="net_test_bluetooth:enable:true" />
- <option name="compatibility:module-arg" value="net_test_types:enable:true" />
- <option name="compatibility:module-arg" value="libbt_packets_test:enable:true" />
- <option name="compatibility:module-arg" value="packets_test_rust:enable:true" />
- <option name="compatibility:module-arg" value="libbluetooth_rs_test:enable:true" />
+<configuration description="List of Bluetooth MTS tests that do not need root access.">
+ <include name="mts-bluetooth-tests-list-shard-00"/>
+ <include name="mts-bluetooth-tests-list-shard-01"/>
+ <include name="mts-bluetooth-tests-list-shard-02"/>
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-bluetooth.xml b/tools/mts-tradefed/res/config/mts-bluetooth.xml
index 594df52..5b8c1bf 100644
--- a/tools/mts-tradefed/res/config/mts-bluetooth.xml
+++ b/tools/mts-tradefed/res/config/mts-bluetooth.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
+<!-- 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.
@@ -13,13 +13,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Runs MTS-bluetooth from a pre-existing MTS installation">
+<configuration description="Runs mts-bluetooth from a pre-existing MTS installation">
<include name="mts" />
-
<include name="mts-bluetooth-tests-list" />
- <include name="mts-bluetooth-tests-list-internal" />
-
<option name="plan" value="mts-bluetooth" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
diff --git a/tools/mts-tradefed/res/config/mts-dnsresolver-tests-list-user.xml b/tools/mts-tradefed/res/config/mts-dnsresolver-tests-list-user.xml
index d418284..30b30b4 100644
--- a/tools/mts-tradefed/res/config/mts-dnsresolver-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-dnsresolver-tests-list-user.xml
@@ -17,4 +17,5 @@
<option name="compatibility:include-filter" value="CtsNetTestCasesLatestSdk android.net.cts.DnsTest" />
<option name="compatibility:include-filter" value="CtsNetTestCasesLatestSdk android.net.cts.DnsResolverTest" />
<option name="compatibility:include-filter" value="CtsNativeNetDnsTestCases" />
+ <option name="compatibility:include-filter" value="doh_ffi_test" />
</configuration>
