mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 13:55:43 +00:00
Bug 795100 - Add a --gecko-path argument to the B2G mochitest testrunner, r=ahal, DONTBUILD(NPOTB)
This commit is contained in:
parent
c6a07311e8
commit
bb23dbc168
@ -96,6 +96,12 @@ class B2GOptions(MochitestOptions):
|
||||
help = "name of the pidfile to generate")
|
||||
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["logFile"] = "mochitest.log"
|
||||
defaults["autorun"] = True
|
||||
@ -116,8 +122,10 @@ class B2GOptions(MochitestOptions):
|
||||
if os.name != "nt":
|
||||
options.remoteWebServer = automation.getLanIp()
|
||||
else:
|
||||
print "ERROR: you must specify a --remote-webserver=<ip address>\n"
|
||||
return None
|
||||
self.error("You must specify a --remote-webserver=<ip address>")
|
||||
|
||||
if options.geckoPath and not options.emulator:
|
||||
self.error("You must specify --emulator if you specify --gecko-path")
|
||||
|
||||
options.webServer = options.remoteWebServer
|
||||
|
||||
@ -407,6 +415,8 @@ def main():
|
||||
auto.setEmulator(True)
|
||||
if options.noWindow:
|
||||
kwargs['noWindow'] = True
|
||||
if options.geckoPath:
|
||||
kwargs['gecko_path'] = options.geckoPath
|
||||
# needless to say sdcard is only valid if using an emulator
|
||||
if options.sdcard:
|
||||
kwargs['sdcard'] = options.sdcard
|
||||
|
Loading…
Reference in New Issue
Block a user