Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 755856 - make marionette client look for adb in path first, r=mdas

Browse Source
This commit is contained in:
Johannes Vogel 2012-08-23 15:46:48 -04:00
parent 7370f46298
commit 991a87a528
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
testing/marionette/client/marionette/emulator.py
View File

@ -17,7 +17,6 @@ import time
from emulator_battery import EmulatorBattery
class LogcatProc(ProcessHandlerMixin):
"""Process handler for logcat which saves all output to a logfile.
"""
@ -66,7 +65,7 @@ class Emulator(object):
raise Exception('Must define B2G_HOME or pass the homedir parameter')
self._check_file(self.homedir)
oldstyle_homedir = os.path.join(self.homedir, 'glue/gonk-ics')
oldstyle_homedir = os.path.join(self.homedir, 'glue','gonk-ics')
if os.access(oldstyle_homedir, os.F_OK):
self.homedir = oldstyle_homedir
@ -78,7 +77,7 @@ class Emulator(object):
if platform.system() == "Darwin":
host_dir = "darwin-x86"
host_bin_dir = os.path.join("out/host", host_dir, "bin")
host_bin_dir = os.path.join("out","host", host_dir, "bin")
if self.arch == "x86":
binary = os.path.join(host_bin_dir, "emulator-x86")
@ -91,9 +90,7 @@ class Emulator(object):
sysdir = "out/target/product/generic"
self.tail_args = ["-cpu", "cortex-a8"]
self.adb = os.path.join(self.homedir, host_bin_dir, "adb")
if not os.access(self.adb, os.F_OK):
self.adb = os.path.join(self.homedir, 'bin/adb')
self._check_for_adb()
if not self.binary:
self.binary = os.path.join(self.homedir, binary)
@ -145,20 +142,24 @@ class Emulator(object):
return self.port is not None
def _check_for_adb(self):
self.adb = os.path.join(self.homedir,
'glue/gonk/out/host/linux-x86/bin/adb')
if not os.access(self.adb, os.F_OK):
self.adb = os.path.join(self.homedir, 'bin/adb')
if not os.access(self.adb, os.F_OK):
adb = subprocess.Popen(['which', 'adb'],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
retcode = adb.wait()
if retcode:
raise Exception('adb not found!')
out = adb.stdout.read().strip()
if len(out) and out.find('/') > -1:
self.adb = out
host_dir = "linux-x86"
if platform.system() == "Darwin":
host_dir = "darwin-x86"
adb = subprocess.Popen(['which', 'adb'],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
if adb.wait() == 0:
self.adb = adb.stdout.read().strip() # remove trailing newline
return
adb_paths = [os.path.join(self.homedir,'glue','gonk','out','host',
host_dir ,'bin','adb'),os.path.join(self.homedir, 'out',
'host', host_dir,'bin', 'adb'),os.path.join(self.homedir,
'bin','adb')]
for option in adb_paths:
if os.path.exists(option):
self.adb = option
return
raise Exception('adb not found!')
def _run_adb(self, args):
args.insert(0, self.adb)