diff options
author | Julien Desprez <jdesprez@google.com> | 2021-03-22 19:10:22 +0000 |
---|---|---|
committer | Julien Desprez <jdesprez@google.com> | 2021-03-22 19:10:30 +0000 |
commit | 5b733931e406ce5d889b293a86d76b252ebc08e8 (patch) | |
tree | 0ffa705e4b000aa4cf8144e41c25ad41b8e18c40 | |
parent | 86651be2bda48264e57bee5960100e5692195e26 (diff) | |
download | csuite-5b733931e406ce5d889b293a86d76b252ebc08e8.tar.gz |
Migrate csuite-tradefed-tests to test mapping
unit tests do not need an explicit definition
Change-Id: I27a3c000bcc360b77d5f012a7a9afb4f72ff1c6c
Test: presubmit
Bug: 180736967
-rw-r--r-- | tools/csuite-tradefed/Android.bp | 4 | ||||
-rw-r--r-- | tools/csuite-tradefed/AndroidTest.xml | 20 | ||||
-rw-r--r-- | tools/csuite-tradefed/TEST_MAPPING | 8 |
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 - } - ] -} |