Move cts-unit-tests to cts-tradefed
Test: make cts; run cts-unit-tests
Bug: 173811050
Change-Id: Iaa3bb22d88563ec070b15f1110ef912e3c473f59
diff --git a/tools/cts-tradefed/res/config/cts-unit-tests.xml b/tools/cts-tradefed/res/config/cts-unit-tests.xml
new file mode 100644
index 0000000..a80a244
--- /dev/null
+++ b/tools/cts-tradefed/res/config/cts-unit-tests.xml
@@ -0,0 +1,32 @@
+<?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>
diff --git a/tools/cts-tradefed/tests/.classpath b/tools/cts-tradefed/tests/.classpath
index 1c238bc..2226a16 100644
--- a/tools/cts-tradefed/tests/.classpath
+++ b/tools/cts-tradefed/tests/.classpath
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/tradefederation"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/cts-tradefed"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
- <classpathentry combineaccessrules="false" kind="src" path="/tradefederation">
- <attributes>
- <attribute name="module" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry combineaccessrules="false" kind="src" path="/cts-tradefed">
+ <classpathentry kind="var" path="TRADEFED_ROOT/out/soong/.intermediates/external/guava/guava-jre/linux_glibc_common/combined/guava-jre.jar">
<attributes>
<attribute name="module" value="true"/>
</attributes>
