Bug 1276474 - Enable all e10s test suites for Windows 7 on Gecko 48+. r=rail
authorRyan VanderMeulen <ryanvm@gmail.com>
Sat, 28 May 2016 16:21:07 -0400 (2016-05-28)
changeset 14279 6b5e33436b612ecf832fd88e92b109541b9ef45b
parent 14278 b641f8dd3c7fe2977bef31878d0c87cccb1f0bb3
child 14280 63ab033a89914add39e71fd2eab0050cd7916891
push id10021
push userryanvm@gmail.com
push dateWed, 01 Jun 2016 02:44:58 +0000 (2016-06-01)
reviewersrail
bugs1276474
Bug 1276474 - Enable all e10s test suites for Windows 7 on Gecko 48+. r=rail
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3164,26 +3164,32 @@ for name, branch in items_at_least(BRANC
                     branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += \
                         MARIONETTE_E10S + MOCHITEST_BC_7_E10S
                     branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += \
                         CRASHTEST_E10S + JSREFTEST_E10S + MARIONETTE_E10S + MOCHITEST_DT_8_E10S + \
                         MOCHITEST_E10S + MOCHITEST_WEBGL_E10S + REFTEST_E10S
 
 # Bug 1194533 - Enable remaining tests on OSX 10.10 for Gecko 48+
 # Bug 1255196 & 1275281 - Enable more Linux e10s test suites for Gecko 48+
+# Bug 1276474 - Enable remaining tests on Windows 7 for Gecko 48+
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 48):
     for platform in PLATFORMS.keys():
-        if platform not in branch['platforms']:
+        if platform not in branch['platforms'] or name in TWIGS:
             continue
         for slave_platform in PLATFORMS[platform]['slave_platforms']:
             if slave_platform in branch['platforms'][platform] and slave_platform in ('yosemite_r7'):
-                if name not in TWIGS:
-                    branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += \
-                        CRASHTEST_E10S + JSREFTEST_E10S + MOCHITEST_DT_8_E10S + MOCHITEST_E10S + \
-                        MOCHITEST_MEDIA_E10S + MOCHITEST_WEBGL_E10S + REFTEST_E10S
+                branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += \
+                    CRASHTEST_E10S + JSREFTEST_E10S + MOCHITEST_DT_8_E10S + MOCHITEST_E10S + \
+                    MOCHITEST_MEDIA_E10S + MOCHITEST_WEBGL_E10S + REFTEST_E10S
+            if slave_platform in branch['platforms'][platform] and slave_platform in ('win7_ix', 'win7_vm', 'win7_vm_gfx', 'win10_64'):
+                branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += \
+                    MOCHITEST_BC_7_E10S + MOCHITEST_E10S + MOCHITEST_MEDIA_E10S + \
+                    REFTEST_NOACCEL + REFTEST_NOACCEL_E10S
+                branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += \
+                    REFTEST_NOACCEL_E10S
             if platform in ['linux64-asan']:
                 branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += \
                     MARIONETTE + MARIONETTE_E10S + MOCHITEST_DT_8_E10S + \
                     REFTEST_E10S_TWO_CHUNKS + REFTEST_NOACCEL_E10S_TWO_CHUNKS + \
                     REFTEST_NOACCEL_TWO_CHUNKS
             if platform in ('linux'):
                 branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += \
                     REFTEST_NOACCEL_E10S_TWO_CHUNKS + REFTEST_NOACCEL_TWO_CHUNKS