зеркало из https://github.com/mozilla/gecko-dev.git
Bug 851610 - Don't look for fastboot for emulator runs, r=ahal
This commit is contained in:
Родитель
5caf400e17
Коммит
dc032ea10f
|
@ -76,7 +76,7 @@ class B2GInstance(object):
|
||||||
return option
|
return option
|
||||||
raise Exception('%s not found!' % binary)
|
raise Exception('%s not found!' % binary)
|
||||||
|
|
||||||
def __init__(self, homedir=None, devicemanager=None):
|
def __init__(self, homedir=None, devicemanager=None, emulator=False):
|
||||||
if not homedir:
|
if not homedir:
|
||||||
homedir = self.find_b2g_dir()
|
homedir = self.find_b2g_dir()
|
||||||
else:
|
else:
|
||||||
|
@ -87,7 +87,7 @@ class B2GInstance(object):
|
||||||
|
|
||||||
self.homedir = homedir
|
self.homedir = homedir
|
||||||
self.adb_path = self.check_adb(self.homedir)
|
self.adb_path = self.check_adb(self.homedir)
|
||||||
self.fastboot_path = self.check_fastboot(self.homedir)
|
self.fastboot_path = None if emulator else self.check_fastboot(self.homedir)
|
||||||
self.update_tools = os.path.join(self.homedir, 'tools', 'update-tools')
|
self.update_tools = os.path.join(self.homedir, 'tools', 'update-tools')
|
||||||
self._dm = devicemanager
|
self._dm = devicemanager
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,7 @@ class Emulator(object):
|
||||||
self.copy_userdata = self.dataImg is None
|
self.copy_userdata = self.dataImg is None
|
||||||
|
|
||||||
def _check_for_b2g(self):
|
def _check_for_b2g(self):
|
||||||
self.b2g = B2GInstance(homedir=self.homedir)
|
self.b2g = B2GInstance(homedir=self.homedir, emulator=True)
|
||||||
self.adb = self.b2g.adb_path
|
self.adb = self.b2g.adb_path
|
||||||
self.homedir = self.b2g.homedir
|
self.homedir = self.b2g.homedir
|
||||||
|
|
||||||
|
@ -277,7 +277,7 @@ waitFor(
|
||||||
marionette.delete_session()
|
marionette.delete_session()
|
||||||
|
|
||||||
def connect(self):
|
def connect(self):
|
||||||
self.adb = B2GInstance.check_adb(self.homedir)
|
self.adb = B2GInstance.check_adb(self.homedir, emulator=True)
|
||||||
self.start_adb()
|
self.start_adb()
|
||||||
|
|
||||||
online, offline = self._get_adb_devices()
|
online, offline = self._get_adb_devices()
|
||||||
|
|
Загрузка…
Ссылка в новой задаче