diff options
| author | Ryan Campbell <ryanjcampbell@google.com> | 2017-10-16 21:53:22 -0700 |
|---|---|---|
| committer | Ryan Campbell <ryanjcampbell@google.com> | 2017-10-18 14:53:22 +0000 |
| commit | 29007f21244798286ba8484fde1b1bd9f81c8a06 (patch) | |
| tree | 9f589b9fea01cd1c316ce58447ef60bc778809a0 | |
| parent | 9f8cd710449d79029fcf217aaa2f23b2283e9f89 (diff) | |
| download | vts-29007f21244798286ba8484fde1b1bd9f81c8a06.tar.gz | |
Fix reporting bug.
Fix log reporting bug caused by vts plans having two result reporters.
Remove dependency on everything.xml from cts (as ag/2485926 did) and
instead specify just one reporter. Copy all other values directly from
the imported plan.
Test: run vts-codelab
Bug: 67723205
Change-Id: I437ddf7968fb5ef2ca20947faff64f6b1692d3a6
Merged-In: I437ddf7968fb5ef2ca20947faff64f6b1692d3a6
Merged-In: If557ec95cf4fb2333835ca1362fd0c59026e3e08
(cherry picked from commit 47b8da0c5b5f4ab22d558ae0e91176cbfaf7f8e2)
| -rw-r--r-- | tools/vts-tradefed/res/config/vts-base.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/vts-tradefed/res/config/vts-base.xml b/tools/vts-tradefed/res/config/vts-base.xml index 3ebaf8837..31d03a847 100644 --- a/tools/vts-tradefed/res/config/vts-base.xml +++ b/tools/vts-tradefed/res/config/vts-base.xml @@ -14,10 +14,20 @@ limitations under the License. --> <configuration description="VTS Main Test Plan"> - <include name="everything" /> + <device_recovery class="com.android.tradefed.device.WaitDeviceRecovery" /> + + <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:rerun-from-file:true" /> + <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:fallback-to-serial-rerun:false" /> + <logger class="com.android.tradefed.log.FileLogger"> + <option name="log-level-display" value="WARN" /> + </logger> <option name="compatibility:skip-all-system-status-check" value="true" /> <option name="max-log-size" value="200" /> + <result_reporter class="com.android.compatibility.common.tradefed.result.ConsoleReporter" /> <result_reporter class="com.android.compatibility.common.tradefed.result.VtsResultReporter" /> - <target_preparer class="com.android.tradefed.targetprep.VtsDeviceInfoCollector" /> <template-include name="reporters" default="basic-reporters" /> + <test class="com.android.compatibility.common.tradefed.testtype.CompatibilityTest" /> + + <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" /> + <target_preparer class="com.android.tradefed.targetprep.VtsDeviceInfoCollector" /> </configuration> |