bug 669874 - add support for adb devicemanager to mochitest-remote make target r=jmaher

This commit is contained in:
Brad Lassey 2011-07-07 13:10:52 -04:00
parent 89814f230c
commit 558792a749
3 changed files with 5 additions and 2 deletions

View File

@ -39,6 +39,7 @@ class DeviceManagerADB(DeviceManager):
def mkDir(self, name):
try:
self.checkCmd(["shell", "mkdir", name])
self.chmodDir(name)
return name
except:
return None

View File

@ -136,7 +136,7 @@ class RemoteOptions(MochitestOptions):
return None
if (options.remoteLogFile == None):
options.remoteLogFile = options.remoteTestRoot + '/mochitest.log'
options.remoteLogFile = options.remoteTestRoot + '/logs/mochitest.log'
if (options.remoteLogFile.count('/') < 1):
options.remoteLogFile = options.remoteTestRoot + '/' + options.remoteLogFile
@ -336,6 +336,8 @@ def main():
if (options == None):
sys.exit(1)
logParent = os.path.dirname(options.remoteLogFile)
dm.mkDir(logParent);
auto.setRemoteLog(options.remoteLogFile)
auto.setServerInfo(options.webServer, options.httpPort, options.sslPort)

View File

@ -64,7 +64,7 @@ RUN_MOCHITEST = \
RUN_MOCHITEST_REMOTE = \
rm -f ./$@.log && \
$(PYTHON) _tests/testing/mochitest/runtestsremote.py --autorun --close-when-done \
--console-level=INFO --log-file=./$@.log --file-level=INFO \
--console-level=INFO --log-file=./$@.log --file-level=INFO $(DM_FLAGS) \
--app=$(ANDROID_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \
$(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)