aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-12-14 00:54:02 -0500
committerGitHub <noreply@github.com>2018-12-14 00:54:02 -0500
commit0cf129208f8d27876ba96b67fec70b8f4c572ab2 (patch)
treed8fddf9b1bf6b9d21c74be48aefbfd046c570c66
parentf7fd1288811c0053ca85f96f8895b37c784bb993 (diff)
parent799606df583e99989145dda2e5b7efd0af6a58ac (diff)
downloadservo-0cf129208f8d27876ba96b67fec70b8f4c572ab2.tar.gz
servo-0cf129208f8d27876ba96b67fec70b8f4c572ab2.zip
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 -->
-rw-r--r--etc/taskcluster/decision_task.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index d336aad16dc..662f64aabef 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -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,