Bug 1275738 - Stop running e10s tests on OSX 10.6. r=jlund
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 25 May 2016 20:55:27 -0400 (2016-05-26)
changeset 14248 f5fa52ba7df1a88a4786d3d937f92977054f4bf3
parent 14246 d2ba520c64405bae8206d32038ce47ec3b2336f4
child 14249 665e53a48d215e52dc589c817658d531aff5e2e8
child 14250 e760aa2e4016d815b565f3f87650662474998c09
push id9996
push userryanvm@gmail.com
push dateThu, 26 May 2016 00:56:17 +0000 (2016-05-26)
reviewersjlund
bugs1275738
Bug 1275738 - Stop running e10s tests on OSX 10.6. r=jlund
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3113,16 +3113,19 @@ for platform in PLATFORMS.keys():
 #   Enable e10s web-platform-tests
 # Bug 1200437 - Use 7 chunks for m-e10-bc on branches > trunk, excluding twigs, 3 chunks elsewhere
 trunk_gecko_version = BRANCHES['mozilla-central']['gecko_version']
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 46):
     for platform in PLATFORMS.keys():
         if platform not in branch['platforms']:
             continue
         for slave_platform in PLATFORMS[platform]['slave_platforms']:
+            # e10s isn't supported on 10.6, so don't schedule tests
+            if slave_platform == "snowleopard":
+                continue
             if platform in branch['platforms'] and slave_platform in branch['platforms'][platform] and \
                     not slave_platform == 'xp_ix':
                 if name in TWIGS or ('gecko_version' in branch and branch['gecko_version'] != trunk_gecko_version):
                     branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_BC_3_E10S
                 else:
                     branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_BC_7_E10S
             # asan is a special snowflake, so treat it as such
             if platform in ['linux64-asan']:
@@ -3142,19 +3145,17 @@ for name, branch in items_at_least(BRANC
                         branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += MOCHITEST_WO_BC_8
                 if name in TWIGS or ('gecko_version' in branch and branch['gecko_version'] != trunk_gecko_version):
                     branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += MOCHITEST_BC_3_E10S
                     branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_DT_2_E10S
                 else:
                     branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += MOCHITEST_BC_7_E10S
                     branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_DT_8_E10S
             # wpt-10s
-            if (platform in ('linux64', 'linux') or
-                (platform == "macosx64" and slave_platform != "snowleopard")):
-
+            if (platform in ('linux64', 'linux') or (platform == "macosx64")):
                 branch['platforms'][platform][slave_platform]['debug_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED_MORE_E10S + WEB_PLATFORM_REFTESTS_E10S
                 branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED_E10S + WEB_PLATFORM_REFTESTS_E10S
 
 # Bug 1215233 - Enable more e10s tests on Windows 7 only
 #   Turn on mochitest-gl-e10s - bug 1221102
 #   Turn on mochitest-e10s-devtools-chrome - bug 1221499
 #   Turn on mochitest-e10s - bug 1232780
 #   Turn on reftest-e10s - bug 1239025
@@ -3318,16 +3319,19 @@ for branch_name in ('try', 'mozilla-cent
 # Enable gpu/clipboard jobs on all branches v.49+
 for platform in PLATFORMS.keys():
     for name, branch in items_at_least(BRANCHES, 'gecko_version', 49):
         if platform in BRANCHES[name]['platforms']:
             if (platform in ['linux64-tsan', 'linux64-cc']):
                 continue
 
             for slave_platform in PLATFORMS[platform]['slave_platforms']:
+                # e10s isn't supported on 10.6, so don't schedule tests
+                if slave_platform == "snowleopard":
+                    continue
                 if platform in BRANCHES[name]['platforms'] and slave_platform in BRANCHES[name]['platforms'][platform]:
                     BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += \
                         MOCHITEST_GPU + MOCHITEST_CLIPBOARD
 
                     # we don't run e10s on winxp
                     if slave_platform != 'xp_ix':
                         BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += \
                             MOCHITEST_GPU_E10S + MOCHITEST_CLIPBOARD_E10S