Bug 1555454 - cleanup merge conflicts on mozilla-beta. a=testonly
☠☠ backed out by 03e5d1efd942 ☠ ☠
authorJoel Maher <jmaher@mozilla.com>
Fri, 28 Jun 2019 18:36:03 +0200
changeset 537156 e1a8f62a1d418cad1cf4cf13fd79e19b23e0a5c1
parent 537155 ac0215d566b2761fe4290c84bf036c3cb8518a1c
child 537157 03e5d1efd942fdf0676da8a4ebf5173e24b5c4eb
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1555454
milestone68.0
Bug 1555454 - cleanup merge conflicts on mozilla-beta. a=testonly
taskcluster/ci/test/test-sets.yml
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -302,17 +302,17 @@ windows-talos:
     # - talos-h1 Bug 1487031 - Disabled for not finding actionable regressions
 
 marionette-gpu-tests:
     - marionette-gpu
 
 marionette-media-tests:
     - marionette-media
 
-# macosx1014-64-tests:
+macosx1014-64-tests:
     - cppunit
     - crashtest
     - firefox-ui-functional-local
     - firefox-ui-functional-remote
 #    - gtest
     - jittest
     - jsreftest
     - marionette
@@ -322,28 +322,28 @@ marionette-media-tests:
 #    - mochitest-chrome
     - mochitest-devtools-chrome
     - mochitest-devtools-webreplay
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
 #    - mochitest-webgl2-core
-#     - mochitest-webgl2-ext test  # timeouts
+#    - mochitest-webgl2-ext test  # timeouts
     - reftest
     - telemetry-tests-client
     - test-verify
     - test-verify-gpu
     - test-verify-wpt
     - web-platform-tests
     - web-platform-tests-reftests
     - web-platform-tests-wdspec
     - xpcshell
 
-# macosx1014-64-qr-tests:
+macosx1014-64-qr-tests:
     - crashtest
     - reftest
 
 macosx64-tests:
     - gtest
     - mochitest
     - mochitest-browser-chrome
     - mochitest-chrome