Bug 1122039 - enable 10.10 tests on try but not enabled by default, and hidden in try chooser syntax page r=coop
authorkmoir@mozilla.com
Fri, 16 Jan 2015 14:25:05 -0500
changeset 5324 7805fa1dd9ed2628b6a73661ba495254662cb6fd
parent 5323 a8db194f4dc1a04d99d24b1f3d4e0666f993eea8
child 5325 72c479940cfb563d515285c4e012e1bb0c1ff21e
push id3951
push userkmoir@mozilla.com
push dateFri, 16 Jan 2015 19:25:47 +0000
reviewerscoop
bugs1122039
Bug 1122039 - enable 10.10 tests on try but not enabled by default, and hidden in try chooser syntax page r=coop
trychooser/tryload.js
--- a/trychooser/tryload.js
+++ b/trychooser/tryload.js
@@ -12,16 +12,17 @@ function initLoad() {
     "win64": 0,
     // test
     "ubuntu32-hw": 0,
     "ubuntu32-vm": 0,
     "ubuntu64-hw": 0,
     "ubuntu64-vm": 0,
     "mac10.6": 0,
     "mac10.8": 0,
+    "mac10.10": 0,
     "winxp-ix": 0,
     "win7-ix": 0,
     "win8-ix": 0,
     "win2012x64": 0,
     "panda": 0,
   };
 }
 
@@ -79,17 +80,18 @@ function getTryLoads(callback) {
                                 load_try_test["ubuntu32-vm"] + load_nontry_test["ubuntu32-vm"];
         totalTestLoad["linux64"] = load_try_test["ubuntu64-hw"] + load_nontry_test["ubuntu64-hw"] +
                                    load_try_test["ubuntu64-vm"] + load_nontry_test["ubuntu64-vm"];
         totalTestLoad["linux64-mulet"] = totalTestLoad["linux64"];
         totalTestLoad["linux64-asan"] = totalTestLoad["linux64"];
         // linux64-st-an: N/A
         totalTestLoad["macosx64"] = Math.max(
                                       load_try_test["mac10.6"] + load_nontry_test["mac10.6"],
-                                      load_try_test["mac10.8"] + load_nontry_test["mac10.8"]);
+                                      load_try_test["mac10.8"] + load_nontry_test["mac10.8"]),
+                                      load_try_test["mac10.10"] + load_nontry_test["mac10.10"]);
         totalTestLoad["win32"] = Math.max(
                                    load_try_test["winxp-ix"] + load_nontry_test["winxp-ix"],
                                    load_try_test["win7-ix"] + load_nontry_test["win7-ix"],
                                    load_try_test["win8-ix"] + load_nontry_test["win8-ix"]);
         totalTestLoad["win64"] = load_try_test["win2012x64"] + load_nontry_test["win2012x64"];
         totalTestLoad["android-api-9"] = Math.max(
                                     load_try_test["ubuntu64-vm"] + load_nontry_test["ubuntu64-vm"]);
         totalTestLoad["android-api-11"] = Math.max(