Bug 1385027 - Enable Stylo tests on Windows. r=kmoir draft
authorJ. Ryan Stinnett <jryans@gmail.com>
Mon, 31 Jul 2017 16:42:18 -0500
changeset 642771 ae71e5a822a299d1932c4cd3ef15ead1fb99b16d
parent 642770 7fb7749a5b9bdca309b26115f1f8fa6edaf1fd75
child 725090 b103d2b7ccce3b19543c226b8a43bb475c26f2c3
push id72855
push userbmo:jryans@gmail.com
push dateTue, 08 Aug 2017 18:03:42 +0000
reviewerskmoir
bugs1385027
milestone57.0a1
Bug 1385027 - Enable Stylo tests on Windows. r=kmoir MozReview-Commit-ID: 127voaDwQBe
taskcluster/ci/test/test-platforms.yml
taskcluster/ci/test/tests.yml
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -114,35 +114,34 @@ macosx64-stylo/debug:
     build-platform: macosx64/debug
     test-sets:
         - stylo-tests
 macosx64-stylo/opt:
     build-platform: macosx64/opt
     test-sets:
         - awsy-stylo
         - stylo-tests
-# Windows needs more work to green up (bug 1385027)
-# windows7-32-stylo/debug:
-#     build-platform: win32/debug
-#     test-sets:
-#         - stylo-tests
-# windows7-32-stylo/opt:
-#     build-platform: win32/opt
-#     test-sets:
-#         - awsy-stylo
-#         - stylo-tests
-# windows10-64-stylo/debug:
-#     build-platform: win64/debug
-#     test-sets:
-#         - stylo-tests
-# windows10-64-stylo/opt:
-#     build-platform: win64/opt
-#     test-sets:
-#         - awsy-stylo
-#         - stylo-tests
+windows7-32-stylo/debug:
+    build-platform: win32/debug
+    test-sets:
+        - stylo-tests
+windows7-32-stylo/opt:
+    build-platform: win32/opt
+    test-sets:
+        - awsy-stylo
+        - stylo-tests
+windows10-64-stylo/debug:
+    build-platform: win64/debug
+    test-sets:
+        - stylo-tests
+windows10-64-stylo/opt:
+    build-platform: win64/opt
+    test-sets:
+        - awsy-stylo
+        - stylo-tests
 
 # QR builds just run a subset right now. Note that the tests in this
 # test set are further restricted in tests.yml to run on certain projects
 # only, to avoid adding too much infra load.
 linux64-qr/opt:
     build-platform: linux64/opt
     test-sets:
         - qr-tests
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -37,23 +37,21 @@ awsy-stylo:
     run-on-projects:
         by-test-platform:
             .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     mozharness:
         script: awsy_script.py
         config:
             by-test-platform:
-                # Do not run on Windows until
-                # bug 1385027 (stylo tests on win) is fixed.
-                #windows10-64-stylo/opt:
-                #    - awsy/taskcluster_windows_config.py
-                macosx64-stylo/opt:
+                windows.*:
+                    - awsy/taskcluster_windows_config.py
+                macosx.*:
                     - awsy/macosx_config.py
-                linux64-stylo/opt:
+                linux.*:
                     - awsy/linux_config.py
         extra-options:
             - --enable-stylo
 
 awsy-stylo-sequential:
     description: "Are we slim yet for Stylo sequential"
     suite: awsy
     treeherder-symbol: tc-SY-stylo-seq(sy)
@@ -68,17 +66,17 @@ awsy-stylo-sequential:
         by-test-platform:
             .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     mozharness:
         script: awsy_script.py
         config:
             # Only run on Linux64.
             by-test-platform:
-                linux64-stylo-sequential/opt:
+                linux.*:
                     - awsy/linux_config.py
         extra-options:
             - --enable-stylo
             - --single-stylo-traversal
 
 cppunit:
     description: "CPP Unit Tests"
     suite: cppunittest
@@ -1230,18 +1228,19 @@ reftest-stylo:
     description: "Reftest run for Stylo"
     suite: reftest/reftest-stylo
     treeherder-symbol: tc-R(Rs)
     virtualization: virtual-with-gpu
     docker-image: {"in-tree": "desktop1604-test"}
     chunks: 16
     run-on-projects:
         by-test-platform:
-            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
-            default: built-projects
+            # Bug 1387160 - Intermittent failures on this platform
+            windows10-64-stylo/debug: []
+            default: ['autoland', 'mozilla-central', 'try']
     mozharness:
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*: