| 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 collections | 5 import collections |
| 6 import contextlib | 6 import contextlib |
| 7 import copy | 7 import copy |
| 8 import itertools | 8 import itertools |
| 9 import json | 9 import json |
| 10 | 10 |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 mode='dev' | 455 mode='dev' |
| 456 ) | 456 ) |
| 457 if bot_config.get('cf_archive_build') and not self.m.tryserver.is_tryserver: | 457 if bot_config.get('cf_archive_build') and not self.m.tryserver.is_tryserver: |
| 458 self.m.archive.clusterfuzz_archive( | 458 self.m.archive.clusterfuzz_archive( |
| 459 build_dir=self.m.chromium.c.build_dir.join( | 459 build_dir=self.m.chromium.c.build_dir.join( |
| 460 self.m.chromium.c.build_config_fs), | 460 self.m.chromium.c.build_config_fs), |
| 461 update_properties=update_step.presentation.properties, | 461 update_properties=update_step.presentation.properties, |
| 462 gs_bucket=bot_config.get('cf_gs_bucket'), | 462 gs_bucket=bot_config.get('cf_gs_bucket'), |
| 463 gs_acl=bot_config.get('cf_gs_acl'), | 463 gs_acl=bot_config.get('cf_gs_acl'), |
| 464 archive_prefix=bot_config.get('cf_archive_name'), | 464 archive_prefix=bot_config.get('cf_archive_name'), |
| 465 archive_subdir_suffix=bot_config.get('cf_archive_subdir_suffix', ''), |
| 465 revision_dir=bot_config.get('cf_revision_dir'), | 466 revision_dir=bot_config.get('cf_revision_dir'), |
| 466 fixed_staging_dir=bot_config.get('fixed_staging_dir', False), | 467 fixed_staging_dir=bot_config.get('fixed_staging_dir', False), |
| 467 ) | 468 ) |
| 468 | 469 |
| 469 def run_mb_and_compile(self, compile_targets, isolated_targets, name_suffix, | 470 def run_mb_and_compile(self, compile_targets, isolated_targets, name_suffix, |
| 470 mb_mastername=None, mb_buildername=None): | 471 mb_mastername=None, mb_buildername=None): |
| 471 if self.m.chromium.c.project_generator.tool == 'mb': | 472 if self.m.chromium.c.project_generator.tool == 'mb': |
| 472 mb_mastername = mb_mastername or self.m.properties['mastername'] | 473 mb_mastername = mb_mastername or self.m.properties['mastername'] |
| 473 mb_buildername = mb_buildername or self.m.properties['buildername'] | 474 mb_buildername = mb_buildername or self.m.properties['buildername'] |
| 474 use_goma = (self.m.chromium.c.compile_py.compiler and | 475 use_goma = (self.m.chromium.c.compile_py.compiler and |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 839 def get_compile_targets_for_scripts(self): | 840 def get_compile_targets_for_scripts(self): |
| 840 return self.m.python( | 841 return self.m.python( |
| 841 name='get compile targets for scripts', | 842 name='get compile targets for scripts', |
| 842 script=self.m.path['checkout'].join( | 843 script=self.m.path['checkout'].join( |
| 843 'testing', 'scripts', 'get_compile_targets.py'), | 844 'testing', 'scripts', 'get_compile_targets.py'), |
| 844 args=[ | 845 args=[ |
| 845 '--output', self.m.json.output(), | 846 '--output', self.m.json.output(), |
| 846 '--', | 847 '--', |
| 847 ] + self.get_common_args_for_scripts(), | 848 ] + self.get_common_args_for_scripts(), |
| 848 step_test_data=lambda: self.m.json.test_api.output({})) | 849 step_test_data=lambda: self.m.json.test_api.output({})) |
| OLD | NEW |