author | shindli <shindli@mozilla.com> |
Tue, 02 Oct 2018 00:00:23 +0300 | |
changeset 439034 | 34efa9f14353353bcdfc6795d6105a7c28c3bba9 |
parent 439033 | 84c7bfa3a0f53f5504fa2add39e0100e48664f26 |
child 439035 | 88315c6735dec7bbb70c5933e2b11e7343114f73 |
push id | 70203 |
push user | shindli@mozilla.com |
push date | Mon, 01 Oct 2018 21:00:39 +0000 |
treeherder | autoland@34efa9f14353 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1305695 |
milestone | 64.0a1 |
backs out | 05df95ba3a989632898ca6d379cf7cce580f9a76 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/python/mach/mach/main.py +++ b/python/mach/mach/main.py @@ -447,51 +447,16 @@ To see more help for a specific command, write_interval=args.log_interval, write_times=write_times) if args.settings_file: # Argument parsing has already happened, so settings that apply # to command line handling (e.g alias, defaults) will be ignored. self.load_settings(args.settings_file) - def _check_debugger(program): - """Checks if debugger specified in command line is installed. - - This internal function calls an in-tree library 'which'. - - If the call does not raise any exceptions, mach is permitted - to continue execution. - - Otherwise, mach execution is halted. - - Args: - program (str): debugger program name. - """ - from which import which, WhichError - try: - which(program) - except WhichError: - print("Specified debugger '{}' is not found.\n" + - "Is it installed? Is it in your PATH?".format(program)) - sys.exit(1) - - # For the codepath where ./mach <test_type> --debugger=<program>, - # checks if the debugger specified is installed on system. - if (hasattr(args.command_args, "debugger") and - getattr(args.command_args, "debugger") is not None): - _check_debugger(getattr(args.command_args, "debugger")) - # For the codepath where ./mach test --debugger=<program> <test_type>, - # checks if the debugger specified is installed on system. - elif (hasattr(args.command_args, "extra_args") and - getattr(args.command_args, "extra_args")): - extra_args = getattr(args.command_args, "extra_args") - # This supports common use case where one debugger is specified. - debugger = [ea.split("=")[1] for ea in extra_args if "debugger" in ea] - _check_debugger(''.join(debugger)) - if not hasattr(args, 'mach_handler'): raise MachError('ArgumentParser result missing mach handler info.') handler = getattr(args, 'mach_handler') try: return Registrar._run_command_handler(handler, context=context, debug_command=args.debug_command,