From 273f8a751ca26cac7c9e45972d573458b5f4d4d5 Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahalberstadt@mozilla.com>
Date: Fri, 1 Apr 2016 11:00:37 -0400
Subject: [PATCH] Bug 1243083 - Enable e10s by default when running reftests,
 r=jmaher

MozReview-Commit-ID: NlTGwdQ2nw

--HG--
extra : rebase_source : 524578da02c2c84487bfe497783a6ea9de594ed9
---
 layout/tools/reftest/reftestcommandline.py     | 13 ++++++-------
 layout/tools/reftest/runreftest.py             |  2 ++
 testing/mozharness/scripts/desktop_unittest.py |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/layout/tools/reftest/reftestcommandline.py b/layout/tools/reftest/reftestcommandline.py
index c026e9fe7709..4327254f8f20 100644
--- a/layout/tools/reftest/reftestcommandline.py
+++ b/layout/tools/reftest/reftestcommandline.py
@@ -180,15 +180,9 @@ class ReftestArgumentsParser(argparse.ArgumentParser):
                           "Valid values are `all', `needs-focus', or `non-needs-focus'. "
                           "Defaults to `all'.")
 
-        self.add_argument("--e10s",
-                          action="store_true",
-                          default=False,
-                          dest="e10s",
-                          help="enables content processes")
-
         self.add_argument("--disable-e10s",
                           action="store_false",
-                          default=False,
+                          default=True,
                           dest="e10s",
                           help="disables content processes")
 
@@ -754,3 +748,8 @@ class RemoteArgumentsParser(ReftestArgumentsParser):
             if (width < 1366 or height < 1050):
                 self.error("ERROR: Invalid screen resolution %sx%s, please adjust to 1366x1050 or higher" % (
                     width, height))
+
+        # Disable e10s by default on Android because we don't run Android
+        # e10s jobs anywhere yet.
+        options.e10s = False
+        return options
diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index d1ee60acbaf3..00b0a6f65acc 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -652,6 +652,7 @@ class RefTest(object):
             # browser environment
             browserEnv = self.buildBrowserEnv(options, profileDir)
 
+            self.log.info("Running with e10s: {}".format(options.e10s))
             status = self.runApp(profile,
                                  binary=options.app,
                                  cmdargs=cmdargs,
@@ -662,6 +663,7 @@ class RefTest(object):
                                  symbolsPath=options.symbolsPath,
                                  options=options,
                                  debuggerInfo=debuggerInfo)
+            self.log.info("Process mode: {}".format('e10s' if options.e10s else 'non-e10s'))
             mozleak.process_leak_log(self.leakLogFile,
                                      leak_thresholds=options.leakThresholds,
                                      stack_fixer=get_stack_fixer_function(options.utilityPath,
diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py
index 8d365ae57744..d8eb1c7c1ce8 100755
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -33,7 +33,7 @@ from mozharness.mozilla.testing.codecoverage import (
 from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
 
 SUITE_CATEGORIES = ['gtest', 'cppunittest', 'jittest', 'mochitest', 'reftest', 'xpcshell', 'mozbase', 'mozmill']
-SUITE_DEFAULT_E10S = ['mochitest']
+SUITE_DEFAULT_E10S = ['mochitest', 'reftest']
 
 # DesktopUnittest {{{1
 class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMixin, CodeCoverageMixin):