зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1278890 - Add xpcshell support to test package mach environment, r=armenzg
This adds the 'xpcshell-test' command to the mach environment found in the test package. This will allow developers to easily run xpcshell after checking out and interactive worker. MozReview-Commit-ID: fBAbfuG5XQ --HG-- extra : rebase_source : 71077c9142f33843ed87d4bc4617a780f775939b
This commit is contained in:
Родитель
57cb071e1b
Коммит
d3c5539c81
|
@ -363,6 +363,7 @@ ARCHIVE_FILES = {
|
|||
'base': 'testing/xpcshell',
|
||||
'patterns': [
|
||||
'head.js',
|
||||
'mach_test_package_commands.py',
|
||||
'moz-http2/**',
|
||||
'moz-spdy/**',
|
||||
'node-http2/**',
|
||||
|
|
|
@ -36,12 +36,14 @@ SEARCH_PATHS = [
|
|||
'mozbase/mozversion',
|
||||
'tools/mach',
|
||||
'tools/wptserve',
|
||||
'xpcshell',
|
||||
]
|
||||
|
||||
# Individual files providing mach commands.
|
||||
MACH_MODULES = [
|
||||
'mochitest/mach_test_package_commands.py',
|
||||
'tools/mach/mach/commands/commandinfo.py',
|
||||
'xpcshell/mach_test_package_commands.py',
|
||||
]
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,65 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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/.
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import os
|
||||
import sys
|
||||
from argparse import Namespace
|
||||
from functools import partial
|
||||
|
||||
|
||||
import mozlog
|
||||
from xpcshellcommandline import parser_desktop
|
||||
|
||||
from mach.decorators import (
|
||||
CommandProvider,
|
||||
Command,
|
||||
)
|
||||
|
||||
|
||||
def run_xpcshell(context, **kwargs):
|
||||
args = Namespace(**kwargs)
|
||||
args.utility_path = context.bin_dir
|
||||
args.testingModulesDir = context.modules_dir
|
||||
|
||||
if not args.appPath:
|
||||
args.appPath = os.path.dirname(context.find_firefox())
|
||||
|
||||
if not args.xpcshell:
|
||||
args.xpcshell = os.path.join(args.appPath, 'xpcshell')
|
||||
|
||||
if not args.pluginsPath:
|
||||
for path in context.ancestors(args.appPath, depth=2):
|
||||
test = os.path.join(path, 'plugins')
|
||||
if os.path.isdir(test):
|
||||
args.pluginsPath = test
|
||||
break
|
||||
|
||||
log = mozlog.commandline.setup_logging("XPCShellTests",
|
||||
args,
|
||||
{"mach": sys.stdout},
|
||||
{"verbose": True})
|
||||
|
||||
if args.testPaths:
|
||||
test_root = os.path.join(context.package_root, 'xpcshell', 'tests')
|
||||
normalize = partial(context.normalize_test_path, test_root)
|
||||
args.testPaths = map(normalize, args.testPaths)
|
||||
|
||||
import runxpcshelltests
|
||||
xpcshell = runxpcshelltests.XPCShellTests(log=log)
|
||||
return xpcshell.runTests(**vars(args))
|
||||
|
||||
|
||||
@CommandProvider
|
||||
class MochitestCommands(object):
|
||||
|
||||
def __init__(self, context):
|
||||
self.context = context
|
||||
|
||||
@Command('xpcshell-test', category='testing',
|
||||
description='Run the xpcshell harness.',
|
||||
parser=parser_desktop)
|
||||
def xpcshell(self, **kwargs):
|
||||
return run_xpcshell(self.context, **kwargs)
|
Загрузка…
Ссылка в новой задаче