From 558792a7498bb956105ce0b0a65200a4acc2ae44 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Thu, 7 Jul 2011 13:10:52 -0400 Subject: [PATCH] bug 669874 - add support for adb devicemanager to mochitest-remote make target r=jmaher --- build/mobile/devicemanagerADB.py | 1 + testing/mochitest/runtestsremote.py | 4 +++- testing/testsuite-targets.mk | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build/mobile/devicemanagerADB.py b/build/mobile/devicemanagerADB.py index cadc54506346..17c302e6a9e2 100644 --- a/build/mobile/devicemanagerADB.py +++ b/build/mobile/devicemanagerADB.py @@ -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 diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py index 4064d6c81b51..142d337a766c 100644 --- a/testing/mochitest/runtestsremote.py +++ b/testing/mochitest/runtestsremote.py @@ -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) diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index 1175c61a5020..03a2cb3d6740 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -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)