Skip to content
This repository has been archived by the owner on Aug 20, 2018. It is now read-only.

Commit

Permalink
Bug 775416 - Mozrunner has to use --app-arg options first in the righ…
Browse files Browse the repository at this point in the history
…t order before appending default args;r=jhammel
  • Loading branch information
Nebelhom authored and Jeff Hammel committed May 28, 2013
1 parent e7e4c29 commit 9e390f0
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions mozrunner/mozrunner/runner.py
Expand Up @@ -126,7 +126,10 @@ def __init__(self, profile, binary, cmdargs=None, env=None,
@property
def command(self):
"""Returns the command list to run."""
return [self.binary, '-profile', self.profile.profile]
commands = [self.binary, '-profile', self.profile.profile]
# Bug 775416 - Ensure that binary options are passed in first
commands[1:1] = self.cmdargs
return commands

def get_repositoryInfo(self):
"""Read repository information from application.ini and platform.ini."""
Expand Down Expand Up @@ -168,7 +171,7 @@ def start(self, debug_args=None, interactive=False, timeout=None, outputTimeout=
self.profile.reset()
assert self.profile.exists(), "%s : failure to reset profile" % self.__class__.__name__

cmd = self._wrap_command(self.command+self.cmdargs)
cmd = self._wrap_command(self.command)

# attach a debugger, if specified
if debug_args:
Expand Down

0 comments on commit 9e390f0

Please sign in to comment.