Merge "Move cts-unit-tests to cts-tradefed" am: 9eb7f01f01
Original change: https://android-review.googlesource.com/c/platform/test/suite_harness/+/1508761
Change-Id: I5f58f27780ab77bf1ae38a8b348de8473fda7c7c
diff --git a/OWNERS b/OWNERS
index d240561..e6419de 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,17 +1,5 @@
-# Android EngProd Approvers
+# Suite test harness Approvers
+dshi@google.com
+frankfeng@google.com
guangzhu@google.com
-fdeng@google.com
-moonk@google.com
jdesprez@google.com
-sbasi@google.com
-
-# Android Partner Eng Approvers
-aaronholden@google.com
-yuji@google.com
-nickrose@google.com
-
-# File Specific Approvers
-per-file Backup* = aabhinav@google.com, jstemmer@google.com, nathch@google.com, niagra@google.com, niamhfw@google.com, philippov@google.com, rthakohov@google.com, tobiast@google.com
-per-file cts-meerkat.xml = alanstokes@google.com, brufino@google.com, lus@google.com, rickywai@google.com
-per-file cts-on-csi*.xml = ycchen@google.com, hsinyichen@google.com, tyanh@google.com
-per-file csi-*.xml = ycchen@google.com, hsinyichen@google.com, tyanh@google.com
diff --git a/common/host-side/tradefed/res/config/cts-unit-tests.xml b/common/host-side/tradefed/res/config/cts-unit-tests.xml
deleted file mode 100644
index a80a244..0000000
--- a/common/host-side/tradefed/res/config/cts-unit-tests.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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="Executes the CTS unit tests">
- <option name="null-device" value="true" />
- <build_provider class="com.android.tradefed.build.StubBuildProvider" />
- <test class="com.android.tradefed.testtype.HostTest" >
- <option name="class" value="com.android.compatibility.common.tradefed.UnitTests" />
- <option name="class" value="com.android.compatibility.common.util.HostUnitTests" />
- <option name="class" value="com.android.compatibility.common.util.UnitTests" />
- <option name="class" value="com.android.compatibility.tradefed.CtsUnitTests" />
- <option name="class" value="com.drawelements.deqp.runner.DeqpTestRunnerTest" />
- </test>
- <logger class="com.android.tradefed.log.FileLogger" />
-
- <result_reporter class="com.android.tradefed.result.ConsoleResultReporter">
- <option name="suppress-passed-tests" value="true" />
- </result_reporter>
- <template-include name="reporters" default="empty" />
-</configuration>
