wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 828069 - Fix up remotexpcshelltests.py to work without an objdir, older mozdevice, and require py2.7. r=gbrown DONTBUILD as tests are not in production.

Browse Source 
(Turn on xpcshell tests for Android 2.2)

--HG--
extra : rebase_source : adb021f893b757442a855dfe30aefeca5604394f
This commit is contained in:
Justin Wood 2013-03-26 21:39:14 -04:00
parent 0e2bf98322
commit 00bf489217
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
testing/xpcshell/remotexpcshelltests.py
View File

@ -152,7 +152,11 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
def setupTestDir(self):
print 'pushing %s' % self.xpcDir
self.device.pushDir(self.xpcDir, self.remoteScriptsDir, retryLimit=10)
try:
self.device.pushDir(self.xpcDir, self.remoteScriptsDir, retryLimit=10)
except TypeError:
# Foopies have an older mozdevice ver without retryLimit
self.device.pushDir(self.xpcDir, self.remoteScriptsDir)
def buildTestList(self):
xpcshell.XPCShellTests.buildTestList(self)
@ -419,6 +423,10 @@ class PathMapping:
def main():
if sys.version_info < (2,7):
print >>sys.stderr, "Error: You must use python version 2.7 or newer but less than 3.0"
sys.exit(1)
parser = RemoteXPCShellOptions()
options, args = parser.parse_args()
if not options.localAPK:
@ -454,10 +462,6 @@ def main():
print >>sys.stderr, "Error: You must specify a test filename in interactive mode!"
sys.exit(1)
if not options.objdir:
print >>sys.stderr, "Error: You must specify an objdir"
sys.exit(1)
xpcsh = XPCShellRemote(dm, options, args)
if not xpcsh.runTests(xpcshell='xpcshell',