From 2b9361154765796b00e1ec6a44e5a93de2635de9 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Thu, 24 Sep 2015 08:18:36 -0400
Subject: [PATCH] Bug 1191952 - enable dromaeo dom on linux. r=armenzg
 a=test-only

---
 testing/talos/talos.json | 38 +++++---------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/testing/talos/talos.json b/testing/talos/talos.json
index 5ff2247567b5..10fd05c95d3d 100644
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -18,10 +18,6 @@
             "tests": ["tresize", "tcanvasmark"],
             "talos_options": ["--e10s"]
         },
-        "chromez-osx-e10s": {
-            "tests": ["tresize", "tcanvasmark"],
-            "talos_options": ["--e10s"]
-        },
         "dromaeojs": {
             "tests": ["dromaeo_css", "kraken", "v8_7"]
         },
@@ -36,10 +32,6 @@
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"],
             "talos_options": ["--e10s"]
         },
-        "other-osx-e10s": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"],
-            "talos_options": ["--e10s"]
-        },
         "other_nol64": {
             "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore"]
         },
@@ -75,10 +67,6 @@
                 "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
             }
         },
-        "g1-osx-e10s": {
-            "tests": ["tp5o_scroll", "glterrain"],
-            "talos_options": ["--e10s"]
-        },
         "g2": {
             "tests": ["damp", "tps"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
@@ -92,12 +80,11 @@
             "pagesets_parent_dir_path": "talos/page_load_test/",
             "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5o.manifest"
         },
-        "g2-osx-e10s": {
-            "tests": ["damp", "tps"],
-            "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"
+        "g3": {
+            "tests": ["dromaeo_dom"]
+        },
+        "g3-e10s": {
+            "tests": ["dromaeo_dom"]
         },
         "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
@@ -106,10 +93,6 @@
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"],
             "talos_options": ["--e10s"]
         },
-        "svgr-osx-e10s": {
-            "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"],
-            "talos_options": ["--e10s"]
-        },
         "tp5o": {
             "tests": ["tp5o"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
@@ -131,17 +114,6 @@
                 "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",