Bug 1076786 - Enable web-platform-tests on OSX 10.8, r=armenzg
authorJames Graham <james@hoppipolla.co.uk>
Wed, 14 Jan 2015 13:49:45 +0000 (2015-01-14)
changeset 11867 43c35b6c987d8beeec5d9c9cb2114163fa98b5dc
parent 11863 8d9202cbf7703103d3cf70411b8e06d351744f24
child 11868 6f26119b8422418af2bd70359262e9a271c699b1
push id8613
push userjames@hoppipolla.co.uk
push dateTue, 24 Feb 2015 21:58:10 +0000 (2015-02-24)
reviewersarmenzg
bugs1076786
Bug 1076786 - Enable web-platform-tests on OSX 10.8, r=armenzg
mozilla-tests/config.py
--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -2009,16 +2009,31 @@ for platform in PLATFORMS.keys():
     if platform not in ['win32', 'win64']:
         continue
     for name, branch in items_at_least(BRANCHES, 'gecko_version', 36):
         for slave_platform in PLATFORMS[platform]['slave_platforms']:
             if platform in BRANCHES[name]['platforms']:
                 if slave_platform in BRANCHES[name]['platforms'][platform]:
                     BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED[:] + WEB_PLATFORM_REFTESTS[:]
 
+# Enable wpt on OSX 10.8 for gecko >= 39
+for platform in PLATFORMS.keys():
+    if platform not in ['macosx64']:
+        continue
+    for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
+        for slave_platform in PLATFORMS[platform]['slave_platforms']:
+
+            # These are not stable enough on OS X 10.6
+            if slave_platform == "snowleopard":
+                continue
+
+            if platform in BRANCHES[name]['platforms']:
+                if slave_platform in BRANCHES[name]['platforms'][platform]:
+                    BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED[:] + WEB_PLATFORM_REFTESTS[:]
+
 # Enable Mn on opt linux/linux64 for gecko >= 32
 for platform in PLATFORMS.keys():
     if platform not in ['linux', 'linux64']:
         continue
     for name, branch in items_at_least(BRANCHES, 'gecko_version', 32):
         for slave_platform in PLATFORMS[platform]['slave_platforms']:
             if platform in BRANCHES[name]['platforms']:
                 if slave_platform in BRANCHES[name]['platforms'][platform]:
@@ -2090,17 +2105,18 @@ for platform in PLATFORMS.keys():
 for platform in PLATFORMS.keys():
     if platform not in BRANCHES['cedar']['platforms']:
         continue
 
     for slave_platform in PLATFORMS[platform]['slave_platforms']:
         if slave_platform not in BRANCHES['cedar']['platforms'][platform]:
             continue
 
-        if platform not in ('linux64', 'linux', 'win32', 'win64'):
+        if not (platform in ('linux64', 'linux', 'win32', 'win64') or
+                (platform == "macosx64" and slave_platform != "snowleopard")):
             BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEB_PLATFORM_REFTESTS[:]
             BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED[:]
         BRANCHES['cedar']['platforms'][platform][slave_platform]['debug_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED[:] + WEB_PLATFORM_REFTESTS
 
 # Enable mozbase unit tests on cedar
 # https://bugzilla.mozilla.org/show_bug.cgi?id=971687
 for platform in PLATFORMS.keys():
     if platform not in BRANCHES['cedar']['platforms']: