Bug 1243083 - Enable e10s by default when running web-platform-tests, r?jgraham draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Fri, 01 Apr 2016 11:02:29 -0400
changeset 346783 c2d3f5de7142a8085458d724735093e5ec2747ab
parent 346782 2ae877ede8ae659eaab3dfc9b12dbdbd91eb6245
child 346784 6c0e610d658888dc7999dc04bd53423d069b2554
child 347308 c7ecf25cd103ff8132adeca1c6f4dd1196ef697a
push id14440
push userahalberstadt@mozilla.com
push dateFri, 01 Apr 2016 15:37:30 +0000
reviewersjgraham
bugs1243083
milestone48.0a1
Bug 1243083 - Enable e10s by default when running web-platform-tests, r?jgraham MozReview-Commit-ID: NlTGwdQ2nw
testing/mozharness/scripts/web_platform_tests.py
testing/web-platform/harness/wptrunner/wptcommandline.py
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -24,16 +24,17 @@ class WebPlatformTest(TestingMixin, Merc
         [['--test-type'], {
             "action": "extend",
             "dest": "test_type",
             "help": "Specify the test types to run."}
          ],
         [['--e10s'], {
             "action": "store_true",
             "dest": "e10s",
+            "default": False,
             "help": "Run with e10s enabled"}
          ],
         [["--total-chunks"], {
             "action": "store",
             "dest": "total_chunks",
             "help": "Number of total chunks"}
          ],
         [["--this-chunk"], {
@@ -130,18 +131,18 @@ class WebPlatformTest(TestingMixin, Merc
                                                        "wpt_errorsummary.log"),
                 "--binary=%s" % self.binary_path,
                 "--symbols-path=%s" % self.query_symbols_url(),
                 "--stackwalk-binary=%s" % self.query_minidump_stackwalk()]
 
         for test_type in c.get("test_type", []):
             cmd.append("--test-type=%s" % test_type)
 
-        if c.get("e10s"):
-            cmd.append("--e10s")
+        if not c["e10s"]:
+            cmd.append("--disable-e10s")
 
         for opt in ["total_chunks", "this_chunk"]:
             val = c.get(opt)
             if val:
                 cmd.append("--%s=%s" % (opt.replace("_", "-"), val))
 
         options = list(c.get("options", []))
 
--- a/testing/web-platform/harness/wptrunner/wptcommandline.py
+++ b/testing/web-platform/harness/wptrunner/wptcommandline.py
@@ -154,18 +154,18 @@ def create_parser(product_choices=None):
     ssl_group.add_argument("--host-key-path", action="store", type=abs_path,
                         help="Path to host private key when using pregenerated ssl certificates")
     ssl_group.add_argument("--host-cert-path", action="store", type=abs_path,
                         help="Path to host certificate when using pregenerated ssl certificates")
 
     gecko_group = parser.add_argument_group("Gecko-specific")
     gecko_group.add_argument("--prefs-root", dest="prefs_root", action="store", type=abs_path,
                              help="Path to the folder containing browser prefs")
-    gecko_group.add_argument("--e10s", dest="gecko_e10s", action="store_true",
-                             help="Run tests with electrolysis preferences")
+    gecko_group.add_argument("--disable-e10s", dest="gecko_e10s", action="store_false", default=True,
+                             help="Run tests without electrolysis preferences")
 
     b2g_group = parser.add_argument_group("B2G-specific")
     b2g_group.add_argument("--b2g-no-backup", action="store_true", default=False,
                            help="Don't backup device before testrun with --product=b2g")
 
     servo_group = parser.add_argument_group("Servo-specific")
     servo_group.add_argument("--user-stylesheet",
                              default=[], action="append", dest="user_stylesheets",