mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 797153 - Remote xpcshell tests shouldn't depend on running from within an objdir, r=jgriffin, DONTBUILD a=NPOTB
This commit is contained in:
Andrew Halberstadt
parent
019f1af228
commit
7498dd3bd0
@ -4,12 +4,14 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
import re, sys, os
|
||||
import sys, os
|
||||
import subprocess
|
||||
import runxpcshelltests as xpcshell
|
||||
import tempfile
|
||||
from automationutils import *
|
||||
from mozdevice import devicemanager, devicemanagerADB, devicemanagerSUT
|
||||
from mozdevice import devicemanagerADB, devicemanagerSUT
|
||||
|
||||
here = os.path.dirname(os.path.abspath(__file__))
|
||||
|
||||
# A specialization of XPCShellTests that runs tests on an Android device
|
||||
# via devicemanager.
|
||||
@ -17,6 +19,8 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
|
||||
|
||||
def __init__(self, devmgr, options, args):
|
||||
xpcshell.XPCShellTests.__init__(self)
|
||||
self.localLib = None
|
||||
self.localBin = None
|
||||
self.options = options
|
||||
self.device = devmgr
|
||||
self.pathMapping = []
|
||||
@ -35,6 +39,15 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
|
||||
self.remoteDebugger = options.debugger
|
||||
self.remoteDebuggerArgs = options.debuggerArgs
|
||||
self.testingModulesDir = options.testingModulesDir
|
||||
|
||||
if self.options.objdir:
|
||||
self.xpcDir = os.path.join(self.options.objdir, "_tests/xpcshell")
|
||||
elif os.path.isdir(os.path.join(here, 'tests')):
|
||||
self.xpcDir = os.path.join(here, 'tests')
|
||||
else:
|
||||
print >> sys.stderr, "Couldn't find local xpcshell test directory"
|
||||
sys.exit(1)
|
||||
|
||||
if options.setup:
|
||||
self.setupUtilities()
|
||||
self.setupModules()
|
||||
@ -85,55 +98,58 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
|
||||
remoteFile = self.remoteJoin(self.remoteScriptsDir, "head.js")
|
||||
self.device.pushFile(local, remoteFile)
|
||||
|
||||
localBin = os.path.join(self.options.objdir, "dist/bin")
|
||||
if not os.path.exists(localBin):
|
||||
localBin = os.path.join(self.options.objdir, "bin")
|
||||
if not os.path.exists(localBin):
|
||||
print >>sys.stderr, "Error: could not find bin in objdir"
|
||||
sys.exit(1)
|
||||
if not self.localBin:
|
||||
self.localBin = os.path.join(self.options.objdir, "dist/bin")
|
||||
if not os.path.exists(self.localBin):
|
||||
self.localBin = os.path.join(self.options.objdir, "bin")
|
||||
if not os.path.exists(self.localBin):
|
||||
print >>sys.stderr, "Error: could not find bin in objdir"
|
||||
sys.exit(1)
|
||||
|
||||
local = os.path.join(localBin, "xpcshell")
|
||||
local = os.path.join(self.localBin, "xpcshell")
|
||||
remoteFile = self.remoteJoin(self.remoteBinDir, "xpcshell")
|
||||
self.device.pushFile(local, remoteFile)
|
||||
|
||||
local = os.path.join(localBin, "components/httpd.js")
|
||||
local = os.path.join(self.localBin, "components/httpd.js")
|
||||
remoteFile = self.remoteJoin(self.remoteComponentsDir, "httpd.js")
|
||||
self.device.pushFile(local, remoteFile)
|
||||
|
||||
local = os.path.join(localBin, "components/httpd.manifest")
|
||||
local = os.path.join(self.localBin, "components/httpd.manifest")
|
||||
remoteFile = self.remoteJoin(self.remoteComponentsDir, "httpd.manifest")
|
||||
self.device.pushFile(local, remoteFile)
|
||||
|
||||
local = os.path.join(localBin, "components/test_necko.xpt")
|
||||
local = os.path.join(self.localBin, "components/test_necko.xpt")
|
||||
remoteFile = self.remoteJoin(self.remoteComponentsDir, "test_necko.xpt")
|
||||
self.device.pushFile(local, remoteFile)
|
||||
|
||||
remoteFile = self.remoteJoin(self.remoteBinDir, os.path.basename(self.options.localAPK))
|
||||
self.device.pushFile(self.options.localAPK, remoteFile)
|
||||
if self.options.localAPK:
|
||||
remoteFile = self.remoteJoin(self.remoteBinDir, os.path.basename(self.options.localAPK))
|
||||
self.device.pushFile(self.options.localAPK, remoteFile)
|
||||
|
||||
self.pushLibs()
|
||||
|
||||
def pushLibs(self):
|
||||
if self.options.localAPK:
|
||||
localLib = os.path.join(self.options.objdir, "dist/fennec")
|
||||
if not os.path.exists(localLib):
|
||||
localLib = os.path.join(self.options.objdir, "fennec/lib")
|
||||
if not os.path.exists(localLib):
|
||||
print >>sys.stderr, "Error: could not find libs in objdir"
|
||||
sys.exit(1)
|
||||
else:
|
||||
localLib = os.path.join(self.options.objdir, 'dist/bin')
|
||||
if not self.localLib:
|
||||
if self.options.localAPK:
|
||||
self.localLib = os.path.join(self.options.objdir, "dist/fennec")
|
||||
if not os.path.exists(self.localLib):
|
||||
self.localLib = os.path.join(self.options.objdir, "fennec/lib")
|
||||
if not os.path.exists(self.localLib):
|
||||
print >>sys.stderr, "Error: could not find libs in objdir"
|
||||
sys.exit(1)
|
||||
else:
|
||||
self.localLib = os.path.join(self.options.objdir, 'dist/bin')
|
||||
|
||||
for file in os.listdir(localLib):
|
||||
for file in os.listdir(self.localLib):
|
||||
if (file.endswith(".so")):
|
||||
print >> sys.stderr, "Pushing %s.." % file
|
||||
if 'libxul' in file:
|
||||
print >> sys.stderr, "This is a big file, it could take a while."
|
||||
remoteFile = self.remoteJoin(self.remoteBinDir, file)
|
||||
self.device.pushFile(os.path.join(localLib, file), remoteFile)
|
||||
self.device.pushFile(os.path.join(self.localLib, file), remoteFile)
|
||||
|
||||
# Additional libraries may be found in a sub-directory such as "lib/armeabi-v7a"
|
||||
localArmLib = os.path.join(localLib, "lib")
|
||||
localArmLib = os.path.join(self.localLib, "lib")
|
||||
if os.path.exists(localArmLib):
|
||||
for root, dirs, files in os.walk(localArmLib):
|
||||
for file in files:
|
||||
@ -146,8 +162,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
|
||||
self.device.pushDir(self.testingModulesDir, self.remoteModulesDir)
|
||||
|
||||
def setupTestDir(self):
|
||||
xpcDir = os.path.join(self.options.objdir, "_tests/xpcshell")
|
||||
self.device.pushDir(xpcDir, self.remoteScriptsDir)
|
||||
self.device.pushDir(self.xpcDir, self.remoteScriptsDir)
|
||||
|
||||
def buildTestList(self):
|
||||
xpcshell.XPCShellTests.buildTestList(self)
|
||||
@ -155,8 +170,7 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
|
||||
for test in self.alltests:
|
||||
uniqueTestPaths.add(test['here'])
|
||||
for testdir in uniqueTestPaths:
|
||||
xpcDir = os.path.join(self.options.objdir, "_tests/xpcshell")
|
||||
abbrevTestDir = os.path.relpath(testdir, xpcDir)
|
||||
abbrevTestDir = os.path.relpath(testdir, self.xpcDir)
|
||||
remoteScriptDir = self.remoteJoin(self.remoteScriptsDir, abbrevTestDir)
|
||||
self.pathMapping.append(PathMapping(testdir, remoteScriptDir))
|
||||
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
|
||||
import sys
|
||||
import os
|
||||
sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0]))))
|
||||
|
||||
import traceback
|
||||
from remotexpcshelltests import XPCShellRemote, RemoteXPCShellOptions
|
||||
from automationutils import *
|
||||
@ -13,7 +15,6 @@ from mozdevice import devicemanagerADB
|
||||
|
||||
DEVICE_TEST_ROOT = '/data/local/tests'
|
||||
|
||||
sys.path.insert(0, os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0]))))
|
||||
|
||||
from marionette import Marionette
|
||||
|
||||
@ -22,6 +23,10 @@ class B2GXPCShellRemote(XPCShellRemote):
|
||||
|
||||
# Overridden
|
||||
def setupUtilities(self):
|
||||
if self.options.xrePath:
|
||||
self.localLib = self.options.xrePath
|
||||
self.localBin = self.options.xrePath
|
||||
|
||||
if self.options.clean:
|
||||
# Ensure a fresh directory structure for our tests
|
||||
self.clean()
|
||||
@ -115,12 +120,11 @@ def main():
|
||||
parser = B2GOptions()
|
||||
options, args = parser.parse_args()
|
||||
|
||||
if options.objdir is None:
|
||||
try:
|
||||
options.objdir = os.path.join(options.b2g_path, 'objdir-gecko')
|
||||
except:
|
||||
print >> sys.stderr, "Need to specify a --b2gpath"
|
||||
sys.exit(1)
|
||||
if options.b2g_path is None:
|
||||
parser.error("Need to specify a --b2gpath")
|
||||
|
||||
if options.xrePath is None:
|
||||
parser.error("Need to specify a --xre-path")
|
||||
|
||||
# Create the Marionette instance
|
||||
kwargs = {}
|
||||
@ -162,8 +166,8 @@ def main():
|
||||
|
||||
|
||||
# You usually run this like :
|
||||
# python runtestsb2g.py --emulator arm --b2gpath $B2GPATH --manifest $MANIFEST [--objdir $OBJDIR
|
||||
# --adbpath $ADBPATH
|
||||
# python runtestsb2g.py --emulator arm --b2gpath $B2GPATH --manifest $MANIFEST [--xre-path $MOZ_HOST_BIN
|
||||
# --adbpath $ADB_PATH
|
||||
# ...]
|
||||
#
|
||||
# For xUnit output you should also pass in --tests-root-dir ..objdir-gecko/_tests
|
||||
|
||||
Loading…
Reference in New Issue
Block a user