From 2e2fbbc7e5ac69e58bbfc6020864974d4bafa666 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Fri, 13 Sep 2013 14:03:54 -0400
Subject: [PATCH] Bug 916045 - remove default cli options from talos.json.
 r=armenzg

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

diff --git a/testing/talos/talos.json b/testing/talos/talos.json
index f5b8ec1444b5..e5c3bcce39c6 100644
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -5,70 +5,28 @@
     },
     "global": {
         "talos_repo": "http://hg.mozilla.org/build/talos",
-        "talos_revision": "ca2229a32cb6"
+        "talos_revision": "655c5140970c"
     },
     "suites": {
         "chromez": {
-            "tests": ["tresize", "tcanvasmark"],
-            "talos_options": [
-                "--mozAfterPaint",
-                "--filter",
-                "ignore_first:5",
-                "--filter",
-                "median"
-            ]
+            "tests": ["tresize", "tcanvasmark"]
         },
         "dirtypaint": {
-            "tests": [
-                "tspaint_places_generated_med",
-                "tspaint_places_generated_max"
-            ],
+            "tests": ["tspaint_places_generated_med", "tspaint_places_generated_max"],
             "talos_addons": [
                 "http://talos-bundles.pvt.build.mozilla.org/profiles/dirtyDBs.zip",
                 "http://talos-bundles.pvt.build.mozilla.org/profiles/dirtyMaxDBs.zip"
-            ],
-            "talos_options": [
-                "--setPref",
-                "hangmonitor.timeout=0",
-                "--mozAfterPaint"
             ]
         },
         "dromaeojs": {
             "tests": ["dromaeo_css", "dromaeo_dom", "kraken", "v8_7"]
         },
         "other": {
-            "tests": ["a11yr", "ts_paint", "tpaint"],
-            "talos_options": [
-                "--mozAfterPaint",
-                "--filter",
-                "ignore_first:5",
-                "--filter",
-                "median"
-            ]
+            "tests": ["a11yr", "ts_paint", "tpaint"]
         },
         "svgr": {
             "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx"]
         },
-        "tpn": {
-            "tests": ["tp5n"],
-            "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/tp5n.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"
-            },
-            "talos_options": [
-                "--mozAfterPaint",
-                "--responsiveness",
-                "--filter",
-                "ignore_first:5",
-                "--filter",
-                "median",
-                "--test_timeout",
-                "3600"
-            ]
-        },
         "tp5o": {
             "tests": ["tp5o"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
@@ -77,17 +35,7 @@
             "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"
-            },
-            "talos_options": [
-                "--mozAfterPaint",
-                "--responsiveness",
-                "--filter",
-                "ignore_first:5",
-                "--filter",
-                "median",
-                "--test_timeout",
-                "3600"
-            ]
+            }
         },
         "xperf": {
             "tests": ["tp5n"],
@@ -99,13 +47,8 @@
                 "64": "http://talos-bundles.pvt.build.mozilla.org/zips/flash64_11_0_d1_98.zip"
             },
             "talos_options": [
-                "--mozAfterPaint",
                 "--xperf_path",
                 "\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\"",
-                "--filter",
-                "ignore_first:5",
-                "--filter",
-                "median",
                 "C:/slave/talos-data/talos/xperf.config"
             ]
         }