OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import copy | 5 import copy |
6 | 6 |
7 from slave import recipe_api | 7 from slave import recipe_api |
8 | 8 |
9 | 9 |
10 # Different types of builds this recipe module can do. | 10 # Different types of builds this recipe module can do. |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 compile_targets.update(test.compile_targets(self.m)) | 230 compile_targets.update(test.compile_targets(self.m)) |
231 | 231 |
232 self.m.chromium.compile(targets=sorted(compile_targets)) | 232 self.m.chromium.compile(targets=sorted(compile_targets)) |
233 self.m.chromium.checkdeps() | 233 self.m.chromium.checkdeps() |
234 | 234 |
235 if self.m.chromium.c.TARGET_PLATFORM == 'android': | 235 if self.m.chromium.c.TARGET_PLATFORM == 'android': |
236 self.m.chromium_android.check_webview_licenses() | 236 self.m.chromium_android.check_webview_licenses() |
237 self.m.chromium_android.findbugs() | 237 self.m.chromium_android.findbugs() |
238 | 238 |
239 has_swarming_tests = any(t.uses_swarming for t in tests) | 239 has_swarming_tests = any(t.uses_swarming for t in tests) |
240 if has_swarming_tests: | 240 if bot_config.get('use_isolate'): |
| 241 self.m.isolate.find_isolated_tests(self.m.chromium.output_dir) |
| 242 # TODO(phajdan.jr): Always use the below codepath once fully tested. |
| 243 elif has_swarming_tests: |
241 isolated_targets = [t.name for t in tests if t.uses_swarming] | 244 isolated_targets = [t.name for t in tests if t.uses_swarming] |
242 self.m.isolate.find_isolated_tests( | 245 self.m.isolate.find_isolated_tests( |
243 self.m.chromium.output_dir, targets=list(set(isolated_targets))) | 246 self.m.chromium.output_dir, targets=list(set(isolated_targets))) |
244 | 247 |
245 got_revision = update_step.presentation.properties['got_revision'] | 248 got_revision = update_step.presentation.properties['got_revision'] |
246 | 249 |
247 if bot_type == 'builder': | 250 if bot_type == 'builder': |
248 if mastername == 'chromium.linux': | 251 if mastername == 'chromium.linux': |
249 # TODO(samuong): This is restricted to Linux for now until I have more | 252 # TODO(samuong): This is restricted to Linux for now until I have more |
250 # confidence that it is not totally broken. | 253 # confidence that it is not totally broken. |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 self.m.chromium.crash_handler() | 317 self.m.chromium.crash_handler() |
315 | 318 |
316 try: | 319 try: |
317 return test_runner() | 320 return test_runner() |
318 finally: | 321 finally: |
319 if self.m.platform.is_win: | 322 if self.m.platform.is_win: |
320 self.m.chromium.process_dumps() | 323 self.m.chromium.process_dumps() |
321 | 324 |
322 if self.m.chromium.c.TARGET_PLATFORM == 'android': | 325 if self.m.chromium.c.TARGET_PLATFORM == 'android': |
323 self.m.chromium_android.common_tests_final_steps() | 326 self.m.chromium_android.common_tests_final_steps() |
OLD | NEW |