| 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 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 def uses_apache(self): | 202 def uses_apache(self): |
| 203 val = self.get_option('use_apache') | 203 val = self.get_option('use_apache') |
| 204 if val is None: | 204 if val is None: |
| 205 return True | 205 return True |
| 206 return val | 206 return val |
| 207 | 207 |
| 208 def path_to_apache(self): | 208 def path_to_apache(self): |
| 209 return self.path_from_chromium_base('third_party', 'apache-win32', 'bin'
, 'httpd.exe') | 209 return self.path_from_chromium_base('third_party', 'apache-win32', 'bin'
, 'httpd.exe') |
| 210 | 210 |
| 211 def path_to_apache_config_file(self): | 211 def path_to_apache_config_file(self): |
| 212 return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'w
in-httpd.conf') | 212 return self._filesystem.join(self.apache_config_directory(), 'win-httpd.
conf') |
| 213 | 213 |
| 214 # | 214 # |
| 215 # PROTECTED ROUTINES | 215 # PROTECTED ROUTINES |
| 216 # | 216 # |
| 217 | 217 |
| 218 def _path_to_driver(self, target=None): | 218 def _path_to_driver(self, target=None): |
| 219 binary_name = '%s.exe' % self.driver_name() | 219 binary_name = '%s.exe' % self.driver_name() |
| 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): |
| (...skipping 17 matching lines...) Expand all Loading... |
| 240 return result | 240 return result |
| 241 | 241 |
| 242 def look_for_new_crash_logs(self, crashed_processes, start_time): | 242 def look_for_new_crash_logs(self, crashed_processes, start_time): |
| 243 if self.get_option('disable_breakpad'): | 243 if self.get_option('disable_breakpad'): |
| 244 return None | 244 return None |
| 245 return self._dump_reader.look_for_new_crash_logs(crashed_processes, star
t_time) | 245 return self._dump_reader.look_for_new_crash_logs(crashed_processes, star
t_time) |
| 246 | 246 |
| 247 def clobber_old_port_specific_results(self): | 247 def clobber_old_port_specific_results(self): |
| 248 if not self.get_option('disable_breakpad'): | 248 if not self.get_option('disable_breakpad'): |
| 249 self._dump_reader.clobber_old_results() | 249 self._dump_reader.clobber_old_results() |
| OLD | NEW |