From 056e9cf88ce8182b68cc91252bfde3325863b7ee Mon Sep 17 00:00:00 2001 From: YAMAMOTO Yuji Date: Fri, 13 Mar 2020 16:57:10 +0900 Subject: [PATCH] Add the android test script to the CI pipeline --- Makefile | 3 +++ azure-pipelines.yml | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2a8625052..23c038514 100644 --- a/Makefile +++ b/Makefile @@ -172,6 +172,9 @@ test-rest: test: spectests emtests middleware wasitests test-rest examples +test-android: + ci/run-docker.sh x86_64-linux-android --manifest-path=lib/singlepass-backend/Cargo.toml + ci/run-docker.sh x86_64-linux-android --manifest-path=lib/runtime-core-tests/Cargo.toml # Integration tests integration-tests: release-clif examples diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8665c1dba..8e3bcf9d2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,6 +46,10 @@ jobs: linux: imageName: "ubuntu-16.04" rust_toolchain: nightly-2019-12-19 + android: + imageName: "ubuntu-16.04" + rust_toolchain: nightly-2019-12-19 + ANDROID: true mac: imageName: "macos-10.14" rust_toolchain: nightly-2019-12-19 @@ -81,10 +85,13 @@ jobs: condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin')) - bash: make test displayName: Tests (*nix) - condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT'))) + condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')), not(variables['ANDROID'])) + - bash: make test-android + displayName: Tests (Android) + condition: and(succeeded(), variables['ANDROID']) - bash: make spectests-cranelift displayName: Tests (Windows) - condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) + condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), not(variables['ANDROID'])) - job: Check pool: