Merge "Migrate csuite-tradefed-tests to test mapping" am: 9554c3baa8 am: 8b2bfe15a5

Original change: https://android-review.googlesource.com/c/platform/test/app_compat/csuite/+/1649247

Change-Id: Iee936de7c381b942ecaabf25a9b64eb6edee17d7

3 files changed, 3 insertions, 29 deletions

diff --git a/tools/csuite-tradefed/Android.bp b/tools/csuite-tradefed/Android.bp
index 2e7ee9a..a441726 100644
--- a/tools/csuite-tradefed/Android.bp
+++ b/tools/csuite-tradefed/Android.bp
@@ -37,5 +37,7 @@ java_test_host {
         "tradefed",
         "csuite-tradefed",
     ],
-    test_suites: ["general-tests"],
+    test_options: {
+        unit_test: true,
+    },
 }
diff --git a/tools/csuite-tradefed/AndroidTest.xml b/tools/csuite-tradefed/AndroidTest.xml
deleted file mode 100644
index 850750e..0000000
--- a/tools/csuite-tradefed/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>
-  <test class="com.android.tradefed.testtype.HostTest" >
-    <option name="class" value="com.android.compatibility.tradefed.CSuiteTradefedTest" />
-  </test>
-</configuration>
diff --git a/tools/csuite-tradefed/TEST_MAPPING b/tools/csuite-tradefed/TEST_MAPPING
deleted file mode 100644
index 80b4a83..0000000
--- a/tools/csuite-tradefed/TEST_MAPPING
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "csuite-tradefed-tests",
-      "host": true
-    }
-  ]
-}