| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 return self._build_path_with_target(target, binary_name) | 220 return self._build_path_with_target(target, binary_name) |
| 221 | 221 |
| 222 def _path_to_crash_service(self): | 222 def _path_to_crash_service(self): |
| 223 binary_name = 'content_shell_crash_service.exe' | 223 binary_name = 'content_shell_crash_service.exe' |
| 224 return self._build_path(binary_name) | 224 return self._build_path(binary_name) |
| 225 | 225 |
| 226 def _path_to_image_diff(self): | 226 def _path_to_image_diff(self): |
| 227 binary_name = 'image_diff.exe' | 227 binary_name = 'image_diff.exe' |
| 228 return self._build_path(binary_name) | 228 return self._build_path(binary_name) |
| 229 | 229 |
| 230 def _path_to_wdiff(self): | |
| 231 # Temporarily disabling wdiff on Windows to see how this affects | |
| 232 # the rate of layout test hanging on try bots (http://crbug.com/637478). | |
| 233 # TODO(qyearsley): Re-enable this when possible. | |
| 234 return None | |
| 235 | |
| 236 def _check_crash_service_available(self): | 230 def _check_crash_service_available(self): |
| 237 """Checks whether the crash service binary is present.""" | 231 """Checks whether the crash service binary is present.""" |
| 238 result = self._check_file_exists(self._path_to_crash_service(), "content
_shell_crash_service.exe") | 232 result = self._check_file_exists(self._path_to_crash_service(), "content
_shell_crash_service.exe") |
| 239 if not result: | 233 if not result: |
| 240 _log.error(" Could not find crash service, unexpected crashes won
't be symbolized.") | 234 _log.error(" Could not find crash service, unexpected crashes won
't be symbolized.") |
| 241 _log.error(' Did you build the target blink_tests?') | 235 _log.error(' Did you build the target blink_tests?') |
| 242 _log.error('') | 236 _log.error('') |
| 243 return result | 237 return result |
| 244 | 238 |
| 245 def look_for_new_crash_logs(self, crashed_processes, start_time): | 239 def look_for_new_crash_logs(self, crashed_processes, start_time): |
| 246 if self.get_option('disable_breakpad'): | 240 if self.get_option('disable_breakpad'): |
| 247 return None | 241 return None |
| 248 return self._dump_reader.look_for_new_crash_logs(crashed_processes, star
t_time) | 242 return self._dump_reader.look_for_new_crash_logs(crashed_processes, star
t_time) |
| 249 | 243 |
| 250 def clobber_old_port_specific_results(self): | 244 def clobber_old_port_specific_results(self): |
| 251 if not self.get_option('disable_breakpad'): | 245 if not self.get_option('disable_breakpad'): |
| 252 self._dump_reader.clobber_old_results() | 246 self._dump_reader.clobber_old_results() |
| OLD | NEW |