From 8f8e24c41b4a23bd82802bb170d132dab1cf691f Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Wed, 21 Jan 2015 11:09:00 -0500
Subject: [PATCH] Bug 1123852 - Update talos.json in order to pick up bug
 1119780 and bug 1121571. Also, actually use e10s for the *-snow-e10s tests.
 r=jmaher

---
 testing/talos/talos.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/testing/talos/talos.json b/testing/talos/talos.json
index a75772999df9..1fc45bac6a28 100644
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -5,7 +5,7 @@
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "ebc4327b8cb8"
+        "talos_revision": "39c9c9b33cfc"
     },
     "extra_options": {
         "android": [ "--apkPath=%(apk_path)s" ]
@@ -39,7 +39,8 @@
             "tests": ["tpaint"]
         },
         "other-snow-e10s": {
-            "tests": ["tpaint"]
+            "tests": ["tpaint"],
+            "talos_options": ["--e10s"]
         },
         "other_nol64": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"]
@@ -80,7 +81,8 @@
             "tests": ["glterrain"]
         },
         "g1-snow-e10s": {
-            "tests": ["glterrain"]
+            "tests": ["glterrain"],
+            "talos_options": ["--e10s"]
         },
         "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
@@ -93,7 +95,8 @@
             "tests": ["tsvgx", "tscrollx"]
         },
         "svgr-snow-e10s": {
-            "tests": ["tsvgx", "tscrollx"]
+            "tests": ["tsvgx", "tscrollx"],
+            "talos_options": ["--e10s"]
         },
         "tp5o": {
             "tests": ["tp5o"],