From f04a74700aa8a1d703f5771a8e41af2023d65e17 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Thu, 8 Jan 2015 10:13:05 -0500
Subject: [PATCH] Bug 1118329 - reduce osx 10.6 talos jobs via talos.json.
 r=armenzg

---
 .../mochitest/tests/SimpleTest/SimpleTest.js  |  4 +--
 testing/talos/talos.json                      | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js
index 8361fc655bbe..5ed67f6fd30e 100644
--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@@ -259,8 +259,8 @@ SimpleTest.ok = function (condition, name, diag) {
         SimpleTest.num_failed++;
         test.result = !test.result;
       }
-      var successInfo = {status:"PASS", expected:"PASS", message:"TEST-PASS"};
-      var failureInfo = {status:"FAIL", expected:"FAIL", message:"TEST-KNOWN-FAIL"};
+      var successInfo = {status:"FAIL", expected:"FAIL", message:"TEST-KNOWN-FAIL"};
+      var failureInfo = {status:"PASS", expected:"FAIL", message:"TEST-UNEXPECTED-PASS"};
     } else {
       var successInfo = {status:"PASS", expected:"PASS", message:"TEST-PASS"};
       var failureInfo = {status:"FAIL", expected:"PASS", message:"TEST-UNEXPECTED-FAIL"};
diff --git a/testing/talos/talos.json b/testing/talos/talos.json
index bf19b406e119..a75772999df9 100644
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -14,10 +14,17 @@
         "chromez": {
             "tests": ["tresize", "tcanvasmark"]
         },
+        "chromez-snow": {
+            "tests": ["tresize", "tcanvasmark"]
+        },
         "chromez-e10s": {
             "tests": ["tresize", "tcanvasmark"],
             "talos_options": ["--e10s"]
         },
+        "chromez-snow-e10s": {
+            "tests": ["tresize", "tcanvasmark"],
+            "talos_options": ["--e10s"]
+        },
         "dromaeojs": {
             "tests": ["dromaeo_css", "dromaeo_dom", "kraken", "v8_7"]
         },
@@ -28,6 +35,12 @@
         "other": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"]
         },
+        "other-snow": {
+            "tests": ["tpaint"]
+        },
+        "other-snow-e10s": {
+            "tests": ["tpaint"]
+        },
         "other_nol64": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"]
         },
@@ -63,6 +76,12 @@
                 "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
             }
         },
+        "g1-snow": {
+            "tests": ["glterrain"]
+        },
+        "g1-snow-e10s": {
+            "tests": ["glterrain"]
+        },
         "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
         },
@@ -70,6 +89,12 @@
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"],
             "talos_options": ["--e10s"]
         },
+        "svgr-snow": {
+            "tests": ["tsvgx", "tscrollx"]
+        },
+        "svgr-snow-e10s": {
+            "tests": ["tsvgx", "tscrollx"]
+        },
         "tp5o": {
             "tests": ["tp5o"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",