Snap for 9055777 from f004a142ff63aa10820c266b170bc6070fffe6ae to mainline-wifi-release
Change-Id: I861398c0632b36eaa3c65d00ea007810b06eddd2
diff --git a/tools/mts-tradefed/res/config/mts-rb-tests-user.xml b/tools/mts-tradefed/res/config/mts-rb-tests-user.xml
new file mode 100644
index 0000000..651b013
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-rb-tests-user.xml
@@ -0,0 +1,19 @@
+<?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 rb tests that do not need root access in active test plans.">
+ <include name="mts-adservices-tests-list" />
+ <include name="mts-ondevicepersonalization-tests-list" />
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-rb.xml b/tools/mts-tradefed/res/config/mts-rb.xml
new file mode 100644
index 0000000..91dc357
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-rb.xml
@@ -0,0 +1,25 @@
+<?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="Config to run RB MTS tests on user builds.">
+ <include name="mts" />
+
+ <option name="enable-root" value="false" />
+
+ <include name="mts-rb-tests-user" />
+
+ <option name="plan" value="mts-rb" />
+</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 4b6075d..e9e11f2 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
@@ -14,7 +14,6 @@
limitations under the License.
-->
<configuration description="List all tests that do not need root access in active test plans.">
- <include name="mts-adservices-tests-list" />
<include name="mts-appsearch-tests-list" />
<include name="mts-art-tests-list-user" />
<include name="mts-cellbroadcast-oem-tests-list" />
@@ -30,7 +29,6 @@
<include name="mts-mediaprovider-tests-list-user" />
<include name="mts-network-tests-list" />
<include name="mts-neuralnetworks-tests-list" />
- <include name="mts-ondevicepersonalization-tests-list" />
<include name="mts-permission-tests-list-oem" />
<include name="mts-preload-verify-tests-list" />
<include name="mts-scheduling-tests-list" />
