Skip to content
Snippets Groups Projects
Commit 0ca332fb authored by Jeff Hammel's avatar Jeff Hammel
Browse files

Bug 934542 - Mirror mozrunner. r=njn.

parent 3948d15a
No related branches found
No related tags found
No related merge requests found
......@@ -307,7 +307,7 @@ class CLI(MozProfileCLI):
parser.add_option('--debugger', dest='debugger',
help="run under a debugger, e.g. gdb or valgrind")
parser.add_option('--debugger-args', dest='debugger_args',
action='append', default=None,
action='store',
help="arguments to the debugger")
parser.add_option('--interactive', dest='interactive',
action='store_true',
......@@ -363,9 +363,11 @@ class CLI(MozProfileCLI):
(debugger_arguments, interactive)
"""
debug_args = self.options.debugger_args
if debug_args is not None:
debug_args = debug_args.split()
interactive = self.options.interactive
if self.options.debugger:
debug_args, interactive = debugger_arguments(self.options.debugger)
debug_args, interactive = debugger_arguments(self.options.debugger, debug_args, interactive)
return debug_args, interactive
def start(self, runner):
......
......@@ -199,7 +199,7 @@ class B2GRunner(RemoteRunner):
msg = "%s with no output" % msg
self.log.testFail(msg % (self.last_test, timeout))
self.dm.killProcess("/system/b2g/b2g", sig=signal.SIGABRT)
self.dm.killProcess('/system/b2g/b2g', sig=signal.SIGABRT)
self.check_for_crashes()
def _reboot_device(self):
......
......@@ -122,16 +122,6 @@ class Runner(object):
traceback.print_exc()
return crashed
def check_for_crashes(self, dump_directory, test_name=None):
crashed = False
try:
crashed = mozcrash.check_for_crashes(dump_directory,
self.symbols_path,
test_name=test_name)
except:
traceback.print_exc()
return crashed
def cleanup(self):
"""
Cleanup all runner state
......
......@@ -6,7 +6,7 @@ import sys
from setuptools import setup
PACKAGE_NAME = "mozrunner"
PACKAGE_VERSION = '5.26'
PACKAGE_VERSION = '5.27'
desc = """Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment