1 files changed, 65 insertions, 0 deletions
diff --git a/testing/xpcshell/mach_test_package_commands.py b/testing/xpcshell/mach_test_package_commands.py
new file mode 100644
index 0000000000..ba11d8160e
--- /dev/null
+++ b/testing/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 absolute_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,
+)
+from mozbuild.base import MachCommandBase
+
+
+def run_xpcshell(context, **kwargs):
+    args = Namespace(**kwargs)
+    args.appPath = args.appPath or os.path.dirname(context.firefox_bin)
+    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)
+        # pylint --py3k: W1636
+        args.testPaths = list(map(normalize, args.testPaths))
+
+    import runxpcshelltests
+
+    xpcshell = runxpcshelltests.XPCShellTests(log=log)
+    return xpcshell.runTests(**vars(args))
+
+
+@CommandProvider
+class MochitestCommands(MachCommandBase):
+    @Command(
+        "xpcshell-test",
+        category="testing",
+        description="Run the xpcshell harness.",
+        parser=parser_desktop,
+    )
+    def xpcshell(self, **kwargs):
+        self._mach_context.activate_mozharness_venv()
+        return run_xpcshell(self._mach_context, **kwargs)