diff --git a/Makefile b/Makefile index 7365279abe5..f6238d6c89e 100644 --- a/Makefile +++ b/Makefile @@ -154,6 +154,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 07f720e863f..249eb3278fc 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: