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 750843 - Update marionette for ICS emulator, a=testonly, npotb

Browse Source
This commit is contained in:
Jonathan Griffin 2012-05-01 12:25:34 -07:00
parent 1bb0cb0aaa
commit 3df312c50c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,24 +36,24 @@ class Emulator(object):
raise Exception('Must define B2G_HOME or pass the homedir parameter') raise Exception('Must define B2G_HOME or pass the homedir parameter')
self.adb = os.path.join(self.homedir, self.adb = os.path.join(self.homedir,
'glue/gonk/out/host/linux-x86/bin/adb') 'glue/gonk-ics/out/host/linux-x86/bin/adb')
if not os.access(self.adb, os.F_OK): if not os.access(self.adb, os.F_OK):
self.adb = os.path.join(self.homedir, 'bin/adb') self.adb = os.path.join(self.homedir, 'bin/adb')
self.binary = os.path.join(self.homedir, self.binary = os.path.join(self.homedir,
'glue/gonk/out/host/linux-x86/bin/emulator') 'glue/gonk-ics/out/host/linux-x86/bin/emulator')
if not os.access(self.binary, os.F_OK): if not os.access(self.binary, os.F_OK):
self.binary = os.path.join(self.homedir, 'bin/emulator') self.binary = os.path.join(self.homedir, 'bin/emulator')
self._check_file(self.binary) self._check_file(self.binary)
self.kernelImg = os.path.join(self.homedir, self.kernelImg = os.path.join(self.homedir,
'boot/kernel-android-qemu/arch/arm/boot/zImage') 'glue/gonk-ics/prebuilts/qemu-kernel/arm/kernel-qemu-armv7')
if not os.access(self.kernelImg, os.F_OK): if not os.access(self.kernelImg, os.F_OK):
self.kernelImg = os.path.join(self.homedir, 'zImage') self.kernelImg = os.path.join(self.homedir, 'kernel-qemu-armv7')
self._check_file(self.kernelImg) self._check_file(self.kernelImg)
self.sysDir = os.path.join(self.homedir, self.sysDir = os.path.join(self.homedir,
'glue/gonk/out/target/product/generic/') 'glue/gonk-ics/out/target/product/generic/')
if not os.access(self.sysDir, os.F_OK): if not os.access(self.sysDir, os.F_OK):
self.sysDir = os.path.join(self.homedir, 'generic/') self.sysDir = os.path.join(self.homedir, 'generic/')
self._check_file(self.sysDir) self._check_file(self.sysDir)