Bug 1120630 - Add --e10s to marionette's mozharness script.;r=jgriffin
authorChris Manchester <cmanchester@mozilla.com>
Tue, 13 Jan 2015 14:28:51 -0500 (2015-01-13)
changeset 3553 672aeab80d6473f1231543815c78a10ee6f5f2b0
parent 3552 6885ce1f2a63dc5e92a5891fd5a794e38405c93d
child 3554 d5789729f348a7ba20c564d175bd7ac8a014070f
push id2769
push usercmanchester@mozilla.com
push dateTue, 13 Jan 2015 19:29:02 +0000 (2015-01-13)
reviewersjgriffin
bugs1120630
Bug 1120630 - Add --e10s to marionette's mozharness script.;r=jgriffin
scripts/marionette.py
--- a/scripts/marionette.py
+++ b/scripts/marionette.py
@@ -131,18 +131,24 @@ class MarionetteTest(TestingMixin, Toolt
          "help": "Number of total chunks",
         }
      ], [
         ["--this-chunk"],
         {"action": "store",
          "dest": "this_chunk",
          "help": "Number of this chunk",
         }
-    ]] + copy.deepcopy(testing_config_options) \
-       + copy.deepcopy(blobupload_config_options)
+     ], [
+        ["--e10s"],
+        {"action": "store_true",
+         "dest": "e10s",
+         "help": "Run tests with multiple processes. (Desktop builds only)",
+        }
+     ]] + copy.deepcopy(testing_config_options) \
+        + copy.deepcopy(blobupload_config_options)
 
     error_list = [
         {'substr': 'FAILED (errors=', 'level': WARNING},
         {'substr': r'''Could not successfully complete transport of message to Gecko, socket closed''', 'level': ERROR},
         {'substr': r'''Connection to Marionette server is lost. Check gecko''', 'level': ERROR},
         {'substr': 'Timeout waiting for marionette on port', 'level': ERROR},
         {'regex': re.compile(r'''(TEST-UNEXPECTED|PROCESS-CRASH)'''), 'level': ERROR},
         {'regex': re.compile(r'''(\b((?!Marionette|TestMarionette|NoSuchElement|XPathLookup|NoSuchWindow|StaleElement|ScriptTimeout|ElementNotVisible|NoSuchFrame|InvalidResponse|Javascript|Timeout|InvalidElementState|NoAlertPresent|InvalidCookieDomain|UnableToSetCookie|InvalidSelector|MoveTargetOutOfBounds)\w*)Exception)'''), 'level': ERROR},
@@ -465,16 +471,19 @@ class MarionetteTest(TestingMixin, Toolt
                                               'runtests.py')]
 
             manifest = os.path.join(dirs['abs_marionette_tests_dir'],
                                     self.config['test_manifest'])
 
             if self.config.get('app_arg'):
                 config_fmt_args['app_arg'] = self.config['app_arg']
 
+            if self.config.get('e10s'):
+                cmd.append('--e10s')
+
         options_group = self._get_options_group(self.config.get('emulator'),
                                                 self.config.get('gaiatest'))
 
         if self.config.get("structured_output"):
             config_fmt_args["raw_log_file"]= "-"
 
         if options_group not in self.tree_config:
             # This allows using the new in-tree format