Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1295492 - Add support for --binary argument to Marionette mach command. r=maja_zf

Browse Source 
MozReview-Commit-ID: 6tru2Ms135j

--HG--
extra : rebase_source : 5286b8e1d5c8d4f9c54fcbdea14fd423dcd9c556
This commit is contained in:
Henrik Skupin 2016-08-30 10:53:07 +02:00
parent 716c3e5830
commit 42a9f616b7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
testing/marionette/mach_commands.py
View File

@ -151,11 +151,8 @@ class MachCommands(MachCommandBase):
tests.append(obj['file_relpath'])
del kwargs['test_objects']
if conditions.is_firefox(self):
bin_path = self.get_binary_path('app')
if kwargs.get('binary') is not None:
print "Warning: ignoring '--binary' option, using binary at " + bin_path
kwargs['binary'] = bin_path
if not kwargs.get('binary') and conditions.is_firefox(self):
kwargs['binary'] = self.get_binary_path('app')
return run_marionette(tests, topsrcdir=self.topsrcdir, **kwargs)
@Command('session-test', category='testing',
@ -170,5 +167,6 @@ class MachCommands(MachCommandBase):
tests.append(obj['file_relpath'])
del kwargs['test_objects']
kwargs['binary'] = self.get_binary_path('app')
return run_session(tests, topsrcdir=self.topsrcdir, **kwargs)
if not kwargs.get('binary') and conditions.is_firefox(self):
kwargs['binary'] = self.get_binary_path('app')
return run_session(tests, topsrcdir=self.topsrcdir, **kwargs)