Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 816079 - Add --gecko-path and --logcat-dir options to b2g xpcshell harness, r=jgriffin, DONTBUILD a=NPOTB,test-only

Browse Source
This commit is contained in:
Andrew Halberstadt 2012-11-28 14:32:34 -05:00
parent 7052c26cb6
commit 366a85e661
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testing/xpcshell/runtestsb2g.py
View File

@ -108,6 +108,15 @@ class B2GOptions(RemoteXPCShellOptions):
dest='use_device_libs',
help="Don't push .so's")
defaults['use_device_libs'] = False
self.add_option("--gecko-path", action="store",
type="string", dest="geckoPath",
help="the path to a gecko distribution that should "
"be installed on the emulator prior to test")
defaults["geckoPath"] = None
self.add_option("--logcat-dir", action="store",
type="string", dest="logcat_dir",
help="directory to store logcat dump files")
defaults["logcat_dir"] = None
defaults['dm_trans'] = 'adb'
defaults['debugger'] = None
@ -126,12 +135,22 @@ def main():
if options.xrePath is None:
parser.error("Need to specify a --xre-path")
if options.geckoPath and not options.emulator:
self.error("You must specify --emulator if you specify --gecko-path")
if options.logcat_dir and not options.emulator:
self.error("You must specify --emulator if you specify --logcat-dir")
# Create the Marionette instance
kwargs = {}
if options.emulator:
kwargs['emulator'] = options.emulator
if options.no_window:
kwargs['noWindow'] = True
if options.geckoPath:
kwargs['gecko_path'] = options.geckoPath
if options.logcat_dir:
kwargs['logcat_dir'] = options.logcat_dir
if options.b2g_path:
kwargs['homedir'] = options.emu_path or options.b2g_path
if options.address: