Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 611230 Remote mochitest fails to honor --utility-path r=ctalbert a=NPOTB

Browse Source
This commit is contained in:
Joel Maher 2010-12-09 14:47:21 -08:00
parent 0cdbc319b0
commit 515bc25359
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/automation.py.in
View File

@ -332,6 +332,7 @@ class Automation(object):
{'allowXULXBL':[(l.host, 'noxul' not in l.options) for l in locations]});
part = """\
user_pref("browser.console.showInPanel", true);
user_pref("browser.dom.window.dump.enabled", true);
user_pref("dom.allow_scripts_to_close_windows", true);
user_pref("dom.disable_open_during_load", false);

21
testing/mochitest/runtestsremote.py
View File

@ -107,15 +107,16 @@ class RemoteOptions(MochitestOptions):
def verifyRemoteOptions(self, options, automation):
options.remoteTestRoot = automation._devicemanager.getDeviceRoot()
productRoot = options.remoteTestRoot + "/" + automation._product
options.utilityPath = options.remoteTestRoot + "/bin"
options.certPath = options.remoteTestRoot + "/certs"
if (options.utilityPath == self._automation.DIST_BIN):
options.utilityPath = productRoot + "/bin"
if options.remoteWebServer == None and os.name != "nt":
if options.remoteWebServer == None:
if os.name != "nt":
options.remoteWebServer = automation.getLanIp()
elif os.name == "nt":
print "ERROR: you must specify a remoteWebServer ip address\n"
else:
print "ERROR: you must specify a --remote-webserver=<ip address>\n"
return None
options.webServer = options.remoteWebServer
@ -125,14 +126,10 @@ class RemoteOptions(MochitestOptions):
return None
if (options.remoteLogFile == None):
options.remoteLogFile = automation._devicemanager.getDeviceRoot() + '/test.log'
options.remoteLogFile = options.remoteTestRoot + '/mochitest.log'
if (options.remoteLogFile.count('/') < 1):
options.remoteLogFile = automation._devicemanager.getDeviceRoot() + '/' + options.remoteLogFile
# Set up our options that we depend on based on the above
productRoot = options.remoteTestRoot + "/" + automation._product
options.utilityPath = productRoot + "/bin"
options.remoteLogFile = options.remoteTestRoot + '/' + options.remoteLogFile
# remoteAppPath or app must be specified to find the product to launch
if (options.remoteAppPath and options.app):