wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 975442: recognize as emulator if device name begins with 'emulator'. r=jgriffin

Browse Source
This commit is contained in:
Vicamo Yang 2014-04-09 10:14:07 +08:00
parent 93417f2cb3
commit 9fba03c823
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/tools/reftest/mach_commands.py
View File

@ -364,7 +364,7 @@ class MachCommands(MachCommandBase):
# they should be modified to work with all devices. # they should be modified to work with all devices.
def is_emulator(cls): def is_emulator(cls):
"""Emulator needs to be configured.""" """Emulator needs to be configured."""
return cls.device_name in ('emulator', 'emulator-jb') return cls.device_name.find('emulator') == 0
@CommandProvider @CommandProvider

2
testing/marionette/mach_commands.py
View File

@ -77,7 +77,7 @@ class B2GCommands(MachCommandBase):
@CommandArgument('tests', nargs='*', metavar='TESTS', @CommandArgument('tests', nargs='*', metavar='TESTS',
help='Path to test(s) to run.') help='Path to test(s) to run.')
def run_marionette_webapi(self, tests, emulator=None, testtype=None): def run_marionette_webapi(self, tests, emulator=None, testtype=None):
if not emulator and self.device_name in ('emulator', 'emulator-jb'): if not emulator and self.device_name.find('emulator') == 0:
emulator='arm' emulator='arm'
if self.substs.get('ENABLE_MARIONETTE') != '1': if self.substs.get('ENABLE_MARIONETTE') != '1':

2
testing/mochitest/mach_commands.py
View File

@ -637,7 +637,7 @@ class MachCommands(MachCommandBase):
# they should be modified to work with all devices. # they should be modified to work with all devices.
def is_emulator(cls): def is_emulator(cls):
"""Emulator needs to be configured.""" """Emulator needs to be configured."""
return cls.device_name in ('emulator', 'emulator-jb') return cls.device_name.find('emulator') == 0
@CommandProvider @CommandProvider