| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import glob | 6 import glob |
| 7 import optparse | 7 import optparse |
| 8 import os.path | 8 import os.path |
| 9 import socket | 9 import socket |
| 10 import sys | 10 import sys |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 type='string', default=None, | 129 type='string', default=None, |
| 130 help='Redirect standard output of NaCl executable.') | 130 help='Redirect standard output of NaCl executable.') |
| 131 parser.add_option('--nacl_exe_stderr', dest='nacl_exe_stderr', | 131 parser.add_option('--nacl_exe_stderr', dest='nacl_exe_stderr', |
| 132 type='string', default=None, | 132 type='string', default=None, |
| 133 help='Redirect standard error of NaCl executable.') | 133 help='Redirect standard error of NaCl executable.') |
| 134 parser.add_option('--expect_browser_process_crash', | 134 parser.add_option('--expect_browser_process_crash', |
| 135 dest='expect_browser_process_crash', | 135 dest='expect_browser_process_crash', |
| 136 action='store_true', | 136 action='store_true', |
| 137 help='Do not signal a failure if the browser process ' | 137 help='Do not signal a failure if the browser process ' |
| 138 'crashes') | 138 'crashes') |
| 139 parser.add_option('--enable_crash_reporter', dest='enable_crash_reporter', |
| 140 action='store_true', default=False, |
| 141 help='Force crash reporting on.') |
| 139 | 142 |
| 140 return parser | 143 return parser |
| 141 | 144 |
| 142 | 145 |
| 143 def ProcessToolLogs(options, logs_dir): | 146 def ProcessToolLogs(options, logs_dir): |
| 144 if options.tool == 'memcheck': | 147 if options.tool == 'memcheck': |
| 145 analyzer = memcheck_analyze.MemcheckAnalyzer('', use_gdb=True) | 148 analyzer = memcheck_analyze.MemcheckAnalyzer('', use_gdb=True) |
| 146 logs_wildcard = 'xml.*' | 149 logs_wildcard = 'xml.*' |
| 147 elif options.tool == 'tsan': | 150 elif options.tool == 'tsan': |
| 148 analyzer = tsan_analyze.TsanAnalyzer('', use_gdb=True) | 151 analyzer = tsan_analyze.TsanAnalyzer('', use_gdb=True) |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 # Validate the URL | 358 # Validate the URL |
| 356 url = options.url | 359 url = options.url |
| 357 if url is None: | 360 if url is None: |
| 358 parser.error('Must specify a URL') | 361 parser.error('Must specify a URL') |
| 359 | 362 |
| 360 return Run(url, options) | 363 return Run(url, options) |
| 361 | 364 |
| 362 | 365 |
| 363 if __name__ == '__main__': | 366 if __name__ == '__main__': |
| 364 sys.exit(RunFromCommandLine()) | 367 sys.exit(RunFromCommandLine()) |
| OLD | NEW |