Snap for 6001299 from 8efcf98d017fdabfc1a90021e6d60117d53e0674 to qt-aml-media-release
Change-Id: I2bb1479924fe9eb244fec2bfebc2c6c6574b20e9
diff --git a/tools/mts-tradefed/etc/mts-tradefed b/tools/mts-tradefed/etc/mts-tradefed
index 3298a6c..7ce7684 100755
--- a/tools/mts-tradefed/etc/mts-tradefed
+++ b/tools/mts-tradefed/etc/mts-tradefed
@@ -83,6 +83,7 @@
TRADEFED_JAR="tradefed"
JARS="tradefed
+ loganalysis
hosttestlib
compatibility-host-util
mts-tradefed
diff --git a/tools/mts-tradefed/res/config/mts-documentsUI-coverage.xml b/tools/mts-tradefed/res/config/mts-documentsUI-coverage.xml
new file mode 100644
index 0000000..82159ee
--- /dev/null
+++ b/tools/mts-tradefed/res/config/mts-documentsUI-coverage.xml
@@ -0,0 +1,49 @@
+<?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-documentsUI-coverage from a pre-existing MTS installation">
+
+ <option name="plan" value="mts-documentsUI-coverage" />
+
+ <include name="everything" />
+
+ <include name="mts-preconditions" />
+
+ <option name="enable-root" value="false" />
+
+ <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+ <option name="run-command" value="settings put global package_verifier_enable 0" />
+ <option name="teardown-command" value="settings put global package_verifier_enable 1"/>
+ </target_preparer>
+
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
+ <option name="property-name" value="ro.build.type" />
+ <option name="expected-value" value="eng"/> <!-- Device should have userdebug/eng build -->
+ <option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
+ </target_preparer>
+
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
+ <option name="property-name" value="ro.product.locale" />
+ <option name="expected-value" value="en-US"/> <!-- Device locale should be US English -->
+ <option name="throw-error" value="false"/> <!-- Only print warning if not en-US -->
+ </target_preparer>
+
+ <option name="compatibility:include-filter" value="DocumentsUITests" />
+ <option name="compatibility:include-filter" value="CtsAppSecurityHostTestCases android.appsecurity.cts.DocumentsTest" />
+ <option name="compatibility:include-filter" value="CtsAppSecurityHostTestCases android.appsecurity.cts.ScopedDirectoryAccessTest" />
+
+ <template-include name="reporters" default="basic-reporters" />
+
+</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-exclude.xml b/tools/mts-tradefed/res/config/mts-exclude.xml
index e7bb9a1..464f9b2 100644
--- a/tools/mts-tradefed/res/config/mts-exclude.xml
+++ b/tools/mts-tradefed/res/config/mts-exclude.xml
@@ -53,5 +53,12 @@
<!-- b/38280830 -->
<option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.VideoDecoderPerfTest#testVp8Goog0Perf1280x0720" />
+
+ <!-- Exclude tests that are not related to media mainlines -->
+ <option name="compatibility:module-arg" value="CtsMediaTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
+
+ <!-- DocumentsUITests is only used to get coverage on virtual devices. -->
+ <option name="compatibility:exclude-filter" value="DocumentsUITests" />
+
</configuration>
diff --git a/tools/mts-tradefed/res/config/mts-media.xml b/tools/mts-tradefed/res/config/mts-media.xml
index d556a9c..173cd4f 100644
--- a/tools/mts-tradefed/res/config/mts-media.xml
+++ b/tools/mts-tradefed/res/config/mts-media.xml
@@ -33,4 +33,7 @@
<!-- b/38280830 -->
<option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.VideoDecoderPerfTest#testVp8Goog0Perf1280x0720" />
+
+ <!-- Exclude tests that are not related to media mainlines -->
+ <option name="compatibility:module-arg" value="CtsMediaTestCases:exclude-annotation:android.media.cts.NonMediaMainlineTest" />
</configuration>
