summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-04-26 23:16:52 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-04-26 23:16:52 +0200
commit7027a5fb1296f5d995dd77fdd3e9fdbf54373277 (patch)
treeb20a5d20694105b1ff392b35a4a3a8fd1c0f711f
parentMerge "Parse BCB command to enter rescue mode." am: e645ba5aca (diff)
parentMerge "Add recovery_host_test to TEST_MAPPING." (diff)
downloadandroid_bootable_recovery-7027a5fb1296f5d995dd77fdd3e9fdbf54373277.tar
android_bootable_recovery-7027a5fb1296f5d995dd77fdd3e9fdbf54373277.tar.gz
android_bootable_recovery-7027a5fb1296f5d995dd77fdd3e9fdbf54373277.tar.bz2
android_bootable_recovery-7027a5fb1296f5d995dd77fdd3e9fdbf54373277.tar.lz
android_bootable_recovery-7027a5fb1296f5d995dd77fdd3e9fdbf54373277.tar.xz
android_bootable_recovery-7027a5fb1296f5d995dd77fdd3e9fdbf54373277.tar.zst
android_bootable_recovery-7027a5fb1296f5d995dd77fdd3e9fdbf54373277.zip
-rw-r--r--TEST_MAPPING4
-rw-r--r--tests/Android.bp2
-rw-r--r--tests/AndroidTest.xml33
3 files changed, 6 insertions, 33 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index a7c34ddaa..c87ece24e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,6 +8,10 @@
},
{
"name": "recovery_component_test"
+ },
+ {
+ "name": "recovery_host_test",
+ "host": true
}
]
}
diff --git a/tests/Android.bp b/tests/Android.bp
index 09ef716d6..2e5334d9e 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -197,6 +197,8 @@ cc_test_host {
"libz",
],
+ test_suites: ["general-tests"],
+
data: ["testdata/*"],
target: {
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
deleted file mode 100644
index 6b86085aa..000000000
--- a/tests/AndroidTest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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="Config for recovery_component_test and recovery_unit_test">
- <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
- <option name="cleanup" value="true" />
- <option name="push" value="recovery_component_test->/data/local/tmp/recovery_component_test/recovery_component_test" />
- <option name="push" value="testdata->/data/local/tmp/recovery_component_test/testdata" />
- <option name="push" value="recovery_unit_test->/data/local/tmp/recovery_unit_test/recovery_unit_test" />
- <option name="push" value="testdata->/data/local/tmp/recovery_unit_test/testdata" />
- </target_preparer>
- <option name="test-suite-tag" value="apct" />
- <test class="com.android.tradefed.testtype.GTest" >
- <option name="native-test-device-path" value="/data/local/tmp/recovery_component_test" />
- <option name="module-name" value="recovery_component_test" />
- </test>
- <test class="com.android.tradefed.testtype.GTest" >
- <option name="native-test-device-path" value="/data/local/tmp/recovery_unit_test" />
- <option name="module-name" value="recovery_unit_test" />
- </test>
-</configuration>