Bug 1207747 - Ensure that logging command line options are always available when running xpcshell tests, r=chmanchester

This commit is contained in:
James Graham 2015-10-08 00:29:39 +01:00
parent a83aaacc09
commit 7c64f71620
4 changed files with 6 additions and 3 deletions

View File

@ -573,7 +573,6 @@ def main():
sys.exit(1)
parser = parser_remote()
commandline.add_logging_group(parser)
options = parser.parse_args()
if not options.localAPK:
for file in os.listdir(os.path.join(options.objdir, "dist")):

View File

@ -148,7 +148,6 @@ def run_remote_xpcshell(parser, options, log):
def main():
parser = parser_b2g()
commandline.add_logging_group(parser)
options = parser.parse_args()
log = commandline.setup_logging("Remote XPCShell",
options,

View File

@ -1428,7 +1428,6 @@ class XPCShellTests(object):
def main():
parser = parser_desktop()
commandline.add_logging_group(parser)
options = parser.parse_args()
log = commandline.setup_logging("XPCShell", options, {"tbpl": sys.stdout})

View File

@ -1,5 +1,7 @@
import argparse
from mozlog import commandline
def add_common_arguments(parser):
parser.add_argument("--app-path",
type=unicode, dest="appPath", default=None,
@ -179,6 +181,8 @@ def add_b2g_arguments(parser):
def parser_desktop():
parser = argparse.ArgumentParser()
add_common_arguments(parser)
commandline.add_logging_group(parser)
return parser
def parser_remote():
@ -187,6 +191,7 @@ def parser_remote():
add_common_arguments(common)
remote = parser.add_argument_group("Remote Options")
add_remote_arguments(remote)
commandline.add_logging_group(parser)
return parser
@ -198,5 +203,6 @@ def parser_b2g():
add_remote_arguments(remote)
b2g = parser.add_argument_group("B2G Options")
add_b2g_arguments(b2g)
commandline.add_logging_group(parser)
return parser