Auto merge of #21738 - servo:jdm-patch-24, r=SimonSapin

Merge android-x86 tests into one step.

This should address some of the bleeding caused by #21736.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21738)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-09-18 12:33:19 -04:00 committed by GitHub
commit 8a1751c2aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -196,8 +196,7 @@ android-x86:
- ./etc/ci/bootstrap-android-and-accept-licences.sh
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach build --target i686-linux-android --release
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach test-android-startup --release
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach test-wpt-android --release /_mozilla/mozilla/DOMParser.html
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach test-wpt-android --release /_mozilla/mozilla/webgl/context_creation_error.html
- env --unset ANDROID_NDK --unset ANDROID_SDK ./mach test-wpt-android --release /_mozilla/mozilla/DOMParser.html /_mozilla/mozilla/webgl/context_creation_error.html
- bash ./etc/ci/lockfile_changed.sh
- ./etc/ci/clean_build_artifacts.sh