Bug 1243083 - Enable e10s by default when running talos, r=jmaher
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Fri, 01 Apr 2016 11:01:23 -0400
changeset 315481 f32c09cf6b231f5b2df0bc0a298cbc20de0485b3
parent 315480 108a50bd1e2aff467c9c6e4ab6af9c111b598412
child 315482 940686f9541f016098b8cae8001835d0d61dd637
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1243083
milestone48.0a1
Bug 1243083 - Enable e10s by default when running talos, r=jmaher MozReview-Commit-ID: NlTGwdQ2nw
testing/talos/talos.json
testing/talos/talos/cmdline.py
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -3,104 +3,104 @@
         "url": "http://talos-bundles.pvt.build.mozilla.org/zips/talos.a6052c33d420.zip",
         "path": ""
     },
     "extra_options": {
         "android": [ "--apkPath=%(apk_path)s" ]
     },
     "suites": {
         "chromez": {
-            "tests": ["tresize", "tcanvasmark"]
+            "tests": ["tresize", "tcanvasmark"],
+            "talos_options": ["--disable-e10s"]
         },
         "chromez-e10s": {
-            "tests": ["tresize", "tcanvasmark"],
-            "talos_options": ["--e10s"]
+            "tests": ["tresize", "tcanvasmark"]
         },
         "dromaeojs": {
-            "tests": ["dromaeo_css", "kraken"]
+            "tests": ["dromaeo_css", "kraken"],
+            "talos_options": ["--disable-e10s"]
         },
         "dromaeojs-e10s": {
-            "tests": ["dromaeo_css", "kraken"],
-            "talos_options": ["--e10s"]
+            "tests": ["dromaeo_css", "kraken"]
         },
         "other": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"]
+            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"],
+            "talos_options": ["--disable-e10s"]
         },
         "other-e10s": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"],
-            "talos_options": ["--e10s"]
+            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"]
         },
         "other_nol64": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"]
+            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"],
+            "talos_options": ["--disable-e10s"]
         },
         "other-e10s_nol64": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"],
-            "talos_options": ["--e10s"]
+            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"]
         },
         "other_l64": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"]
+            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"],
+            "talos_options": ["--disable-e10s"]
         },
         "other-e10s_l64": {
-            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"],
-            "talos_options": ["--e10s"]
+            "tests": ["a11yr", "ts_paint", "tpaint", "sessionrestore", "sessionrestore_no_auto_restore", "tabpaint"]
         },
         "g1": {
             "tests": ["tp5o_scroll", "glterrain"],
+            "talos_options": ["--disable-e10s"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip"
         },
         "g1-e10s": {
             "tests": ["tp5o_scroll", "glterrain"],
-            "talos_options": ["--e10s"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip"
         },
         "g2": {
             "tests": ["damp", "tps"],
+            "talos_options": ["--disable-e10s"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip"
         },
         "g2-e10s": {
             "tests": ["damp", "tps"],
-            "talos_options": ["--e10s"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip"
         },
         "g3": {
-            "tests": ["dromaeo_dom"]
+            "tests": ["dromaeo_dom"],
+            "talos_options": ["--disable-e10s"]
         },
         "g3-e10s": {
-            "tests": ["dromaeo_dom"],
-            "talos_options": ["--e10s"]
+            "tests": ["dromaeo_dom"]
         },
         "svgr": {
-            "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
+            "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"],
+            "talos_options": ["--disable-e10s"]
         },
         "svgr-e10s": {
-            "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"],
-            "talos_options": ["--e10s"]
+            "tests": ["tsvgx", "tsvgr_opacity", "tart", "tscrollx", "cart"]
         },
         "tp5o": {
             "tests": ["tp5o"],
+            "talos_options": ["--disable-e10s"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip"
         },
         "tp5o-e10s": {
             "tests": ["tp5o"],
-            "talos_options": ["--e10s"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip"
         },
         "xperf": {
             "tests": ["tp5n"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
             "talos_options": [
+                "--disable-e10s",
                 "--xperf_path",
                 "\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\""
             ]
         },
         "xperf-e10s": {
             "tests": ["tp5n"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
             "talos_options": [
-                "--e10s",
                 "--xperf_path",
                 "\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\""
             ]
         }
     },
     "mobile-suites": {
         "remote-tsvgx": {
             "tests": ["tsvgm"],
--- a/testing/talos/talos/cmdline.py
+++ b/testing/talos/talos/cmdline.py
@@ -62,18 +62,19 @@ def create_parser(mach_interface=False):
     add_arg('--branchName', dest="branch_name", default='',
             help="Name of the branch we are testing on")
     add_arg('--browserWait', dest='browser_wait', default=5, type=int,
             help="Amount of time allowed for the browser to cleanly close")
     add_arg('-a', '--activeTests',
             help="List of tests to run, separated by ':' (ex. damp:cart)")
     add_arg('--suite',
             help="Suite to use (instead of --activeTests)")
-    add_arg('--e10s', action='store_true',
-            help="enable e10s")
+    add_arg('--disable-e10s', dest='e10s',
+            action='store_false', default=True,
+            help="disable e10s")
     add_arg('--noChrome', action='store_true',
             help="do not run tests as chrome")
     add_arg('--rss', action='store_true',
             help="Collect RSS counters from pageloader instead of the"
                  " operating system")
     add_arg('--mainthread', action='store_true',
             help="Collect mainthread IO data from the browser by setting"
                  " an environment variable")