Auto merge of #22446 - servo:x86, r=SimonSapin

Disable emulator testing in try-wpt-android and try-android too

<!-- 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/22446)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-12-14 00:54:02 -05:00 committed by GitHub
commit 0cf129208f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,6 +21,11 @@ def main(task_for):
macos_wpt = magicleap_dev = linux_arm32_dev = linux_arm64_dev = \
android_arm32_dev_from_macos = lambda: None
# FIXME https://github.com/servo/servo/issues/22187
# In-emulator testing is disabled for now. (Instead we only compile.)
# This local variable shadows the module-level function of the same name.
android_x86_wpt = android_x86_release
all_tests = [
linux_tidy_unit_docs,
windows_unit,
@ -28,7 +33,7 @@ def main(task_for):
magicleap_dev,
android_arm32_dev,
android_arm32_release,
android_x86_release,
android_x86_wpt,
linux_arm32_dev,
linux_arm64_dev,
linux_wpt,