Skip to content
This repository has been archived by the owner on Sep 15, 2021. It is now read-only.

Commit

Permalink
Bug 1120630 - Add --e10s to marionette's mozharness script.;r=jgriffin
Browse files Browse the repository at this point in the history
  • Loading branch information
chmanchester committed Jan 13, 2015
1 parent 0d67139 commit 8387181
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions scripts/marionette.py
Expand Up @@ -136,8 +136,14 @@ class MarionetteTest(TestingMixin, TooltoolMixin,
"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},
Expand Down Expand Up @@ -470,6 +476,9 @@ def run_marionette(self):
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'))

Expand Down

0 comments on commit 8387181

Please sign in to comment.