forked from mirrors/gecko-dev
1abba2da72
Previously the run-wizard script would add a command to source the virtualenv in ~/.bashrc after mozharness finished setting things up. This is fragile, assumes people are using bash, etc. Plus it appeared to intermittently fail for some users. Instead, this activates the virtualenv directly from individual mach commands that need it. This guarantees we will always be using the virtualenv if required (and won't be using it if not). The 'activate_this.py' script is invoked the same way that we do it for in-tree mach commands: https://dxr.mozilla.org/mozilla-central/rev/9c06e744b1befb3a2e2fdac7414ce18220774a1d/python/mozbuild/mozbuild/virtualenv.py#456 MozReview-Commit-ID: CfcoiVJXQTl --HG-- extra : rebase_source : da01d1ce1bd9b41c89922e989f857c4de8c09341
65 lines
2 KiB
Python
65 lines
2 KiB
Python
# 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.appPath = args.appPath or os.path.dirname(context.firefox_bin)
|
|
args.e10s = context.mozharness_config.get('e10s', args.e10s)
|
|
args.utility_path = context.bin_dir
|
|
args.testingModulesDir = context.modules_dir
|
|
|
|
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):
|
|
self.context.activate_mozharness_venv()
|
|
return run_xpcshell(self.context, **kwargs)
|