Bug 795099 - Add --gecko-path argument to runreftestb2g.py, r=jgriffin; DONTBUILD because NPOTB

This commit is contained in:
Andrew Halberstadt 2012-10-05 11:12:05 -04:00
parent 2291b0cd5c
commit c4f991bfaf

View File

@ -100,6 +100,11 @@ class B2GOptions(ReftestOptions):
type = "string", dest = "pidFile", type = "string", dest = "pidFile",
help = "name of the pidfile to generate") help = "name of the pidfile to generate")
defaults["pidFile"] = "" defaults["pidFile"] = ""
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
defaults["remoteTestRoot"] = None defaults["remoteTestRoot"] = None
defaults["logFile"] = "reftest.log" defaults["logFile"] = "reftest.log"
defaults["autorun"] = True defaults["autorun"] = True
@ -125,6 +130,9 @@ class B2GOptions(ReftestOptions):
options.webServer = options.remoteWebServer options.webServer = options.remoteWebServer
if options.geckoPath and not options.emulator:
self.error("You must specify --emulator if you specify --gecko-path")
#if not options.emulator and not options.deviceIP: #if not options.emulator and not options.deviceIP:
# print "ERROR: you must provide a device IP" # print "ERROR: you must provide a device IP"
# return None # return None
@ -447,6 +455,8 @@ def main(args=sys.argv[1:]):
host,port = options.marionette.split(':') host,port = options.marionette.split(':')
kwargs['host'] = host kwargs['host'] = host
kwargs['port'] = int(port) kwargs['port'] = int(port)
if options.geckoPath:
kwargs['gecko_path'] = options.geckoPath
marionette = Marionette(**kwargs) marionette = Marionette(**kwargs)
auto.marionette = marionette auto.marionette = marionette