| 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 # Put the cygwin directory first in the path to find cygwin1.dll. | 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"]) | 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 | 169 # Configure the cygwin directory so that pywebsocket finds proper |
| 170 # python executable to run cgi program. | 170 # python executable to run cgi program. |
| 171 env["CYGWIN_PATH"] = self.path_from_chromium_base("third_party", "cygwin
", "bin") | 171 env["CYGWIN_PATH"] = self.path_from_chromium_base("third_party", "cygwin
", "bin") |
| 172 if self.get_option('register_cygwin'): | 172 if self.get_option('register_cygwin'): |
| 173 setup_mount = self.path_from_chromium_base("third_party", "cygwin",
"setup_mount.bat") | 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. | 174 self._executive.run_command([setup_mount]) # Paths are all absolute
, so this does not require a cwd. |
| 175 return env | 175 return env |
| 176 | 176 |
| 177 def _modules_to_search_for_symbols(self): | |
| 178 # FIXME: we should return the path to the ffmpeg equivalents to detect i
f we have the mp3 and aac codecs installed. | |
| 179 # See https://bugs.webkit.org/show_bug.cgi?id=89706. | |
| 180 return [] | |
| 181 | |
| 182 def check_build(self, needs_http, printer): | 177 def check_build(self, needs_http, printer): |
| 183 result = super(WinPort, self).check_build(needs_http, printer) | 178 result = super(WinPort, self).check_build(needs_http, printer) |
| 184 | 179 |
| 185 self._crash_service_available = self._check_crash_service_available() | 180 self._crash_service_available = self._check_crash_service_available() |
| 186 if not self._crash_service_available: | 181 if not self._crash_service_available: |
| 187 result = test_run_results.UNEXPECTED_ERROR_EXIT_STATUS | 182 result = test_run_results.UNEXPECTED_ERROR_EXIT_STATUS |
| 188 | 183 |
| 189 if result: | 184 if result: |
| 190 _log.error('For complete Windows build requirements, please see:') | 185 _log.error('For complete Windows build requirements, please see:') |
| 191 _log.error('') | 186 _log.error('') |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 return result | 232 return result |
| 238 | 233 |
| 239 def look_for_new_crash_logs(self, crashed_processes, start_time): | 234 def look_for_new_crash_logs(self, crashed_processes, start_time): |
| 240 if self.get_option('disable_breakpad'): | 235 if self.get_option('disable_breakpad'): |
| 241 return None | 236 return None |
| 242 return self._dump_reader.look_for_new_crash_logs(crashed_processes, star
t_time) | 237 return self._dump_reader.look_for_new_crash_logs(crashed_processes, star
t_time) |
| 243 | 238 |
| 244 def clobber_old_port_specific_results(self): | 239 def clobber_old_port_specific_results(self): |
| 245 if not self.get_option('disable_breakpad'): | 240 if not self.get_option('disable_breakpad'): |
| 246 self._dump_reader.clobber_old_results() | 241 self._dump_reader.clobber_old_results() |
| OLD | NEW |