| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 if self._crash_service: | 154 if self._crash_service: |
| 155 self._crash_service.stop() | 155 self._crash_service.stop() |
| 156 self._crash_service = None | 156 self._crash_service = None |
| 157 | 157 |
| 158 def setup_environ_for_server(self): | 158 def setup_environ_for_server(self): |
| 159 env = super(WinPort, self).setup_environ_for_server() | 159 env = super(WinPort, self).setup_environ_for_server() |
| 160 | 160 |
| 161 # FIXME: This is a temporary hack to get the cr-win bot online until | 161 # FIXME: This is a temporary hack to get the cr-win bot online until |
| 162 # someone from the cr-win port can take a look. | 162 # someone from the cr-win port can take a look. |
| 163 apache_envvars = ['SYSTEMDRIVE', 'SYSTEMROOT', 'TEMP', 'TMP'] | 163 apache_envvars = ['SYSTEMDRIVE', 'SYSTEMROOT', 'TEMP', 'TMP'] |
| 164 for key, value in os.environ.items(): | 164 for key, value in self.host.environ.copy().items(): |
| 165 if key not in env and key in apache_envvars: | 165 if key not in env and key in apache_envvars: |
| 166 env[key] = value | 166 env[key] = value |
| 167 | 167 |
| 168 # Put the cygwin directory first in the path to find cygwin1.dll. | 168 # Put the cygwin directory first in the path to find cygwin1.dll. |
| 169 env["PATH"] = "%s;%s" % (self.path_from_chromium_base("third_party", "cy
gwin", "bin"), env["PATH"]) | 169 env["PATH"] = "%s;%s" % (self.path_from_chromium_base("third_party", "cy
gwin", "bin"), env["PATH"]) |
| 170 # Configure the cygwin directory so that pywebsocket finds proper | 170 # Configure the cygwin directory so that pywebsocket finds proper |
| 171 # python executable to run cgi program. | 171 # python executable to run cgi program. |
| 172 env["CYGWIN_PATH"] = self.path_from_chromium_base("third_party", "cygwin
", "bin") | 172 env["CYGWIN_PATH"] = self.path_from_chromium_base("third_party", "cygwin
", "bin") |
| 173 if self.get_option('register_cygwin'): | 173 if self.get_option('register_cygwin'): |
| 174 setup_mount = self.path_from_chromium_base("third_party", "cygwin",
"setup_mount.bat") | 174 setup_mount = self.path_from_chromium_base("third_party", "cygwin",
"setup_mount.bat") |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 return result | 241 return result |
| 242 | 242 |
| 243 def look_for_new_crash_logs(self, crashed_processes, start_time): | 243 def look_for_new_crash_logs(self, crashed_processes, start_time): |
| 244 if self.get_option('disable_breakpad'): | 244 if self.get_option('disable_breakpad'): |
| 245 return None | 245 return None |
| 246 return self._dump_reader.look_for_new_crash_logs(crashed_processes, star
t_time) | 246 return self._dump_reader.look_for_new_crash_logs(crashed_processes, star
t_time) |
| 247 | 247 |
| 248 def clobber_old_port_specific_results(self): | 248 def clobber_old_port_specific_results(self): |
| 249 if not self.get_option('disable_breakpad'): | 249 if not self.get_option('disable_breakpad'): |
| 250 self._dump_reader.clobber_old_results() | 250 self._dump_reader.clobber_old_results() |
| OLD | NEW |