OLD | NEW |
1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze
ged | 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze
ged |
3 # | 3 # |
4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
6 # met: | 6 # met: |
7 # | 7 # |
8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 self._port.start_helper() | 195 self._port.start_helper() |
196 | 196 |
197 # Check that the system dependencies (themes, fonts, ...) are correct. | 197 # Check that the system dependencies (themes, fonts, ...) are correct. |
198 if not self._options.nocheck_sys_deps: | 198 if not self._options.nocheck_sys_deps: |
199 self._printer.write_update("Checking system dependencies ...") | 199 self._printer.write_update("Checking system dependencies ...") |
200 exit_code = self._port.check_sys_deps(self.needs_servers(test_names)
) | 200 exit_code = self._port.check_sys_deps(self.needs_servers(test_names)
) |
201 if exit_code: | 201 if exit_code: |
202 self._port.stop_helper() | 202 self._port.stop_helper() |
203 return exit_code | 203 return exit_code |
204 | 204 |
205 if self._options.enable_versioned_results and self._filesystem.exists(se
lf._results_directory): | 205 if self._options.archive_results and self._filesystem.exists(self._resul
ts_directory): |
206 if self._options.clobber_old_results: | 206 if self._options.clobber_old_results: |
207 _log.warning("Flag --enable_versioned_results overrides --clobbe
r-old-results.") | 207 _log.warning("Flag archive_results overrides --clobber-old-resul
ts.") |
208 self._clobber_old_archived_results() | 208 self._clobber_old_archived_results() |
209 # Rename the existing results folder for archiving. | 209 # Rename the existing results folder for archiving. |
210 self._rename_results_folder() | 210 self._rename_results_folder() |
211 elif self._options.clobber_old_results: | 211 elif self._options.clobber_old_results: |
212 self._clobber_old_results() | 212 self._clobber_old_results() |
213 | 213 |
214 # Create the output directory if it doesn't already exist. | 214 # Create the output directory if it doesn't already exist. |
215 self._port.host.filesystem.maybe_make_directory(self._results_directory) | 215 self._port.host.filesystem.maybe_make_directory(self._results_directory) |
216 | 216 |
217 self._port.setup_test_run() | 217 self._port.setup_test_run() |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 return int(worker_name.split('/')[1]) if worker_name else -1 | 477 return int(worker_name.split('/')[1]) if worker_name else -1 |
478 | 478 |
479 stats = {} | 479 stats = {} |
480 for result in initial_results.results_by_name.values(): | 480 for result in initial_results.results_by_name.values(): |
481 if result.type != test_expectations.SKIP: | 481 if result.type != test_expectations.SKIP: |
482 stats[result.test_name] = {'results': (_worker_number(result.wor
ker_name), result.test_number, result.pid, int(result.test_run_time * 1000), int
(result.total_run_time * 1000))} | 482 stats[result.test_name] = {'results': (_worker_number(result.wor
ker_name), result.test_number, result.pid, int(result.test_run_time * 1000), int
(result.total_run_time * 1000))} |
483 stats_trie = {} | 483 stats_trie = {} |
484 for name, value in stats.iteritems(): | 484 for name, value in stats.iteritems(): |
485 json_results_generator.add_path_to_trie(name, value, stats_trie) | 485 json_results_generator.add_path_to_trie(name, value, stats_trie) |
486 return stats_trie | 486 return stats_trie |
OLD | NEW |