| OLD | NEW |
| 1 # Copyright (C) 2012 Google Inc. All rights reserved. | 1 # Copyright (C) 2012 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 for arg in self._args: | 144 for arg in self._args: |
| 145 if filesystem.exists(filesystem.join(self._base_path, arg)): | 145 if filesystem.exists(filesystem.join(self._base_path, arg)): |
| 146 paths.append(arg) | 146 paths.append(arg) |
| 147 else: | 147 else: |
| 148 relpath = filesystem.relpath(arg, self._base_path) | 148 relpath = filesystem.relpath(arg, self._base_path) |
| 149 if filesystem.exists(filesystem.join(self._base_path, relpath)): | 149 if filesystem.exists(filesystem.join(self._base_path, relpath)): |
| 150 paths.append(filesystem.normpath(relpath)) | 150 paths.append(filesystem.normpath(relpath)) |
| 151 else: | 151 else: |
| 152 _log.warning('Path was not found:' + arg) | 152 _log.warning('Path was not found:' + arg) |
| 153 | 153 |
| 154 skipped_directories = set(['.svn', 'resources']) | 154 skipped_directories = set(['resources']) |
| 155 test_files = find_files.find(filesystem, self._base_path, paths, skipped
_directories, _is_test_file) | 155 test_files = find_files.find(filesystem, self._base_path, paths, skipped
_directories, _is_test_file) |
| 156 tests = [] | 156 tests = [] |
| 157 for path in test_files: | 157 for path in test_files: |
| 158 relative_path = filesystem.relpath(path, self._base_path).replace('\
\', '/') | 158 relative_path = filesystem.relpath(path, self._base_path).replace('\
\', '/') |
| 159 if self._options.use_skipped_list and self._port.skips_perf_test( | 159 if self._options.use_skipped_list and self._port.skips_perf_test( |
| 160 relative_path) and filesystem.normpath(relative_path) not in
paths: | 160 relative_path) and filesystem.normpath(relative_path) not in
paths: |
| 161 continue | 161 continue |
| 162 test = PerfTestFactory.create_perf_test(self._port, relative_path, p
ath, | 162 test = PerfTestFactory.create_perf_test(self._port, relative_path, p
ath, |
| 163 test_runner_count=self._opti
ons.test_runner_count) | 163 test_runner_count=self._opti
ons.test_runner_count) |
| 164 tests.append(test) | 164 tests.append(test) |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 if metrics: | 371 if metrics: |
| 372 self._results.append((test, metrics)) | 372 self._results.append((test, metrics)) |
| 373 else: | 373 else: |
| 374 failures += 1 | 374 failures += 1 |
| 375 _log.error('FAILED') | 375 _log.error('FAILED') |
| 376 | 376 |
| 377 _log.info('Finished: %f s', time.time() - start_time) | 377 _log.info('Finished: %f s', time.time() - start_time) |
| 378 _log.info('') | 378 _log.info('') |
| 379 | 379 |
| 380 return failures | 380 return failures |
| OLD | NEW |