diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 17:08:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 17:08:36 +0000 |
commit | 4a29cb9b257582baa92082f9bd978fdb764414f7 (patch) | |
tree | 83c89f1b8c2b800dc37f6df711d2aa241764cc90 | |
parent | 88e03486d3707cbcf17c8b225364cb3b76ed127c (diff) | |
parent | 6c9c9c1429d7feff17e16a3fcb8b133d5a74df37 (diff) | |
download | platform_external_bc-android11-mainline-conscrypt-release.tar.gz platform_external_bc-android11-mainline-conscrypt-release.tar.bz2 platform_external_bc-android11-mainline-conscrypt-release.zip |
bc: run the tests in presubmit. am: 4241b89a43 am: de180e85f2 am: 6c9c9c1429android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-release
Change-Id: I3da4e8b89677780b75e630c38c2a40c68950afdb
-rw-r--r-- | Android.bp | 14 | ||||
-rw-r--r-- | TEST_MAPPING | 7 | ||||
-rw-r--r-- | bc-tests.xml | 26 | ||||
-rwxr-xr-x | run-bc-tests-on-android.sh | 15 |
4 files changed, 62 insertions, 0 deletions
@@ -61,3 +61,17 @@ cc_binary_host { name: "gavinhoward-bc", defaults: ["bc-defaults"], } + +sh_test { + name: "bc-tests", + src: "run-bc-tests-on-android.sh", + filename: "run-bc-tests-on-android.sh", + test_suites: ["general-tests"], + host_supported: true, + device_supported: false, + test_config: "bc-tests.xml", + data: [ + "functions.sh", + "tests/**/*", + ], +} diff --git a/TEST_MAPPING b/TEST_MAPPING new file mode 100644 index 00000000..c05ac950 --- /dev/null +++ b/TEST_MAPPING @@ -0,0 +1,7 @@ +{ + "presubmit": [ + { + "name": "bc-tests" + } + ] +} diff --git a/bc-tests.xml b/bc-tests.xml new file mode 100644 index 00000000..6d70d3c0 --- /dev/null +++ b/bc-tests.xml @@ -0,0 +1,26 @@ +<?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="Config for running bc-tests through Atest or in Infra"> + <option name="test-suite-tag" value="bc-tests" /> + <!-- This test requires a device, so it's not annotated with a null-device. --> + <test class="com.android.tradefed.testtype.binary.ExecutableHostTest" > + <option name="binary" value="run-bc-tests-on-android.sh" /> + <!-- Test script assumes a relative path with the tests/ folders. --> + <option name="relative-path-execution" value="true" /> + <!-- Tests shouldn't be that long but set 15m to be safe. --> + <option name="per-binary-timeout" value="15m" /> + </test> +</configuration> diff --git a/run-bc-tests-on-android.sh b/run-bc-tests-on-android.sh new file mode 100755 index 00000000..d957a7e8 --- /dev/null +++ b/run-bc-tests-on-android.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Copy the tests across. +adb shell rm -rf /data/local/tmp/bc-tests/ +adb shell mkdir /data/local/tmp/bc-tests/ +adb push tests/ /data/local/tmp/bc-tests/ +adb push functions.sh /data/local/tmp/bc-tests/ + +if tty -s; then + dash_t="-t" +else + dash_t="" +fi + +exec adb shell $dash_t /data/local/tmp/bc-tests/tests/all.sh bc 0 1 0 1 bc |