Add ART gtests to the ART Module test plan for MTS.HEADmaster

Also, following the MTS documentation, split the list of ART tests in
two sub-lists:
- a list of tests that do not need root
  access (`tools/mts-tradefed/res/config/mts-art-tests-list-user.xml`);
- a list of tests that do need root
  access (`tools/mts-tradefed/res/config/mts-art-tests-list-eng-only.xml`).

The currently supported ART run-tests do not need root access and thus
are all part of the first ("user") list. As many ART gtests require
root access, all ART gtests have been included in the
second ("eng-only") list for the sake of simplicity, but we should
later identify the ones that do not actually require root access and
move them from the "eng-only" list to the "user" list.

(cherry picked from commit 52f8ace31ea72316d55bdfa3ef215eac1a8a42cb)

Test: m mts && mts-tradefed run commandAndExit mts-art
Bug: 167385698
Change-Id: Ic47be897b26cae722a89c812239f977a8958587e
Merged-In: Ic47be897b26cae722a89c812239f977a8958587e

5 files changed, 31 insertions, 4 deletions

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
new file mode 100644
index 0000000..c3b3ce7
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-eng-only.xml
@@ -0,0 +1,24 @@
+<?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. -->
+    <option name="compatibility:include-filter" value="ArtGtestsTargetInstallApex" />
+
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-art-tests-list.xml b/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
index b353b73..1948534 100644
--- a/tools/mts-tradefed/res/config/mts-art-tests-list.xml
+++ b/tools/mts-tradefed/res/config/mts-art-tests-list-user.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="ART MTS test list.">
+<configuration description="List of ART MTS tests that do not need root access.">
 
     <!-- ART run-tests. -->
     <!-- TODO(rpl): Find a way to express this list in a more concise fashion. -->
diff --git a/tools/mts-tradefed/res/config/mts-art.xml b/tools/mts-tradefed/res/config/mts-art.xml
index 2751de7..e45220e 100644
--- a/tools/mts-tradefed/res/config/mts-art.xml
+++ b/tools/mts-tradefed/res/config/mts-art.xml
@@ -17,7 +17,8 @@
 
     <include name="mts" />
 
-    <include name="mts-art-tests-list" />
+    <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-tests-list-eng-only.xml b/tools/mts-tradefed/res/config/mts-tests-list-eng-only.xml
index dd9cd94..9580187 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,8 +14,9 @@
      limitations under the License.
 -->
 <configuration description="List tests that need root access.">
-    <include name="mts-dnsresolver-tests-list-eng-only" />
     <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-statsd-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 4046604..bd977e0 100644
--- a/tools/mts-tradefed/res/config/mts-tests-list-user.xml
+++ b/tools/mts-tradefed/res/config/mts-tests-list-user.xml
@@ -14,10 +14,11 @@
      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-documentsUI-oem-tests-list" />
     <include name="mts-dnsresolver-tests-list-user" />
+    <include name="mts-documentsUI-oem-tests-list" />
     <include name="mts-ipsec-tests-list" />
     <include name="mts-media-tests-list" />
     <include name="mts-network-tests-list" />