Bug 1167287 - update talos to pick up spsprofiling update and talos.json updates for osx e10s. r=wlach

testing/talos/talos.json

@@ -1,11 +1,11 @@
 {
     "talos.zip": {
-        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.ccab6c42b5da.zip",
+        "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.a6052c33d420.zip",
         "path": ""
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "ccab6c42b5da"
+        "talos_revision": "a6052c33d420"
     },
     "extra_options": {
         "android": [ "--apkPath=%(apk_path)s" ]
@@ -14,14 +14,11 @@
         "chromez": {
             "tests": ["tresize", "tcanvasmark"]
         },
-        "chromez-snow": {
-            "tests": ["tresize", "tcanvasmark"]
-        },
         "chromez-e10s": {
             "tests": ["tresize", "tcanvasmark"],
             "talos_options": ["--e10s"]
         },
-        "chromez-snow-e10s": {
+        "chromez-osx-e10s": {
             "tests": ["tresize", "tcanvasmark"],
             "talos_options": ["--e10s"]
         },
@@ -35,11 +32,8 @@
         "other": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"]
         },
-        "other-snow": {
+        "other-osx-e10s": {
-            "tests": ["tpaint"]
+            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"],
-        },
-        "other-snow-e10s": {
-            "tests": ["tpaint"],
             "talos_options": ["--e10s"]
         },
         "other_nol64": {
@@ -77,11 +71,8 @@
                 "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
             }
         },
-        "g1-snow": {
+        "g1-osx-e10s": {
-            "tests": ["glterrain"]
+            "tests": ["tp5o_scroll", "glterrain"],
-        },
-        "g1-snow-e10s": {
-            "tests": ["glterrain"],
             "talos_options": ["--e10s"]
         },
         "g2": {
@@ -90,6 +81,20 @@
             "pagesets_parent_dir_path": "talos/page_load_test/",
             "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
         },
+        "g2-e10s": {
+            "tests": ["damp"],
+            "talos_options": ["--e10s"],
+            "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
+            "pagesets_parent_dir_path": "talos/page_load_test/",
+            "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
+        },
+        "g2-osx-e10s": {
+            "tests": ["damp"],
+            "talos_options": ["--e10s"],
+            "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
+            "pagesets_parent_dir_path": "talos/page_load_test/",
+            "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
+        },
         "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
         },
@@ -97,11 +102,8 @@
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"],
             "talos_options": ["--e10s"]
         },
-        "svgr-snow": {
+        "svgr-osx-e10s": {
-            "tests": ["tsvgx", "tscrollx"]
+            "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"],
-        },
-        "svgr-snow-e10s": {
-            "tests": ["tsvgx", "tscrollx"],
             "talos_options": ["--e10s"]
         },
         "tp5o": {
@@ -125,6 +127,17 @@
                 "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
             }
         },
+        "tp5o-osx-e10s": {
+            "tests": ["tp5o"],
+            "talos_options": ["--e10s"],
+            "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
+            "pagesets_parent_dir_path": "talos/page_load_test/",
+            "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest",
+            "plugins": {
+                "32": "http://talos-bundles.pvt.build.mozilla.org/zips/flash32_10_3_183_5.zip",
+                "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
+            }
+        },
         "xperf": {
             "tests": ["tp5n"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
@@ -158,9 +171,6 @@
         }
     },
     "mobile-suites": {
-        "remote-tspaint": {
-            "tests": ["ts_paint"]
-        },
         "remote-tsvgx": {
             "tests": ["tsvgm"],
             "talos_options": [
@@ -168,24 +178,6 @@
                 "--tppagecycles", "7"
             ]
         },
-        "remote-tcanvasmark": {
-            "tests": ["tcanvasmark"],
-            "talos_options": [
-                "--noChrome"
-            ]
-        },
-        "remote-trobopan": {
-            "tests": ["trobopan"],
-            "talos_options": [
-                "--fennecIDs", "../fennec_ids.txt"
-            ]
-        },
-        "remote-troboprovider": {
-            "tests": ["tprovider"],
-            "talos_options": [
-                "--fennecIDs", "../fennec_ids.txt"
-            ]
-        },
         "remote-trobocheck2": {
             "tests": ["tcheck2"],
             "talos_options": [