| 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 | 152 |
| 153 if self._crash_service: | 153 if self._crash_service: |
| 154 self._crash_service.stop() | 154 self._crash_service.stop() |
| 155 self._crash_service = None | 155 self._crash_service = None |
| 156 | 156 |
| 157 def setup_environ_for_server(self): | 157 def setup_environ_for_server(self): |
| 158 env = super(WinPort, self).setup_environ_for_server() | 158 env = super(WinPort, self).setup_environ_for_server() |
| 159 | 159 |
| 160 # FIXME: This is a temporary hack to get the cr-win bot online until | 160 # FIXME: This is a temporary hack to get the cr-win bot online until |
| 161 # someone from the cr-win port can take a look. | 161 # someone from the cr-win port can take a look. |
| 162 # TODO(qyearsley): Remove this in a separate CL. |
| 162 apache_envvars = ['SYSTEMDRIVE', 'SYSTEMROOT', 'TEMP', 'TMP'] | 163 apache_envvars = ['SYSTEMDRIVE', 'SYSTEMROOT', 'TEMP', 'TMP'] |
| 163 for key, value in self.host.environ.copy().items(): | 164 for key, value in self.host.environ.copy().items(): |
| 164 if key not in env and key in apache_envvars: | 165 if key not in env and key in apache_envvars: |
| 165 env[key] = value | 166 env[key] = value |
| 166 | 167 |
| 167 # Put the cygwin directory first in the path to find cygwin1.dll. | |
| 168 env['PATH'] = '%s;%s' % (self.path_from_chromium_base('third_party', 'cy
gwin', 'bin'), env['PATH']) | |
| 169 # Configure the cygwin directory so that pywebsocket finds proper | |
| 170 # python executable to run cgi program. | |
| 171 env['CYGWIN_PATH'] = self.path_from_chromium_base('third_party', 'cygwin
', 'bin') | |
| 172 if self.get_option('register_cygwin'): | |
| 173 setup_mount = self.path_from_chromium_base('third_party', 'cygwin',
'setup_mount.bat') | |
| 174 self._executive.run_command([setup_mount]) # Paths are all absolute
, so this does not require a cwd. | |
| 175 return env | 168 return env |
| 176 | 169 |
| 177 def check_build(self, needs_http, printer): | 170 def check_build(self, needs_http, printer): |
| 178 result = super(WinPort, self).check_build(needs_http, printer) | 171 result = super(WinPort, self).check_build(needs_http, printer) |
| 179 | 172 |
| 180 self._crash_service_available = self._check_crash_service_available() | 173 self._crash_service_available = self._check_crash_service_available() |
| 181 if not self._crash_service_available: | 174 if not self._crash_service_available: |
| 182 result = test_run_results.UNEXPECTED_ERROR_EXIT_STATUS | 175 result = test_run_results.UNEXPECTED_ERROR_EXIT_STATUS |
| 183 | 176 |
| 184 if result: | 177 if result: |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 return result | 225 return result |
| 233 | 226 |
| 234 def look_for_new_crash_logs(self, crashed_processes, start_time): | 227 def look_for_new_crash_logs(self, crashed_processes, start_time): |
| 235 if self.get_option('disable_breakpad'): | 228 if self.get_option('disable_breakpad'): |
| 236 return None | 229 return None |
| 237 return self._dump_reader.look_for_new_crash_logs(crashed_processes, star
t_time) | 230 return self._dump_reader.look_for_new_crash_logs(crashed_processes, star
t_time) |
| 238 | 231 |
| 239 def clobber_old_port_specific_results(self): | 232 def clobber_old_port_specific_results(self): |
| 240 if not self.get_option('disable_breakpad'): | 233 if not self.get_option('disable_breakpad'): |
| 241 self._dump_reader.clobber_old_results() | 234 self._dump_reader.clobber_old_results() |
| OLD | NEW |