Merge "migrate csuite-harness-tests out of test mapping"

3 files changed, 5 insertions, 33 deletions

diff --git a/harness/Android.bp b/harness/Android.bp
index 9298db8..5111c1b 100644
--- a/harness/Android.bp
+++ b/harness/Android.bp
@@ -37,11 +37,9 @@ java_test_host {
     srcs: [
         "src/test/java/**/*.java",
     ],
-    libs: [
-        "csuite-harness",
-        "tradefed",
-    ],
     static_libs: [
+        "tradefed",
+        "csuite-harness",
         "compatibility-tradefed",
         "guava-testlib",
         "jimfs",
@@ -49,5 +47,7 @@ java_test_host {
         "objenesis",
         "testng",
     ],
-    test_suites: ["general-tests"],
+    test_options: {
+        unit_test: true,
+    },
 }
diff --git a/harness/AndroidTest.xml b/harness/AndroidTest.xml
deleted file mode 100644
index b97e56e..0000000
--- a/harness/AndroidTest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="Executes the C-Suite harness unit tests">
-  <test class="com.android.tradefed.testtype.HostTest" >
-    <option name="class" value="com.android.csuite.CSuiteUnitTests" />
-  </test>
-</configuration>
diff --git a/harness/TEST_MAPPING b/harness/TEST_MAPPING
deleted file mode 100644
index 0e50c9a..0000000
--- a/harness/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "csuite-harness-tests",
-      "host": true
-    }
-  ]
-}