Chromium Code Reviews| 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 contextlib | 5 import contextlib |
| 6 import copy | 6 import copy |
| 7 import json | 7 import json |
| 8 | 8 |
| 9 from infra.libs.infra_types import freeze, thaw | 9 from infra.libs.infra_types import freeze, thaw |
| 10 from slave import recipe_api | 10 from slave import recipe_api |
| (...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 719 compile_targets = list(set(compile_targets) & | 719 compile_targets = list(set(compile_targets) & |
| 720 set(self.m.filter.compile_targets)) | 720 set(self.m.filter.compile_targets)) |
| 721 # Always add |matching_exes|. They will be covered by |compile_targets|, | 721 # Always add |matching_exes|. They will be covered by |compile_targets|, |
| 722 # but adding |matching_exes| makes determing if conditional tests are | 722 # but adding |matching_exes| makes determing if conditional tests are |
| 723 # necessary easier. For example, if we didn't do this we could end up | 723 # necessary easier. For example, if we didn't do this we could end up |
| 724 # with chrome_run as a compile_target and not chrome (since chrome_run | 724 # with chrome_run as a compile_target and not chrome (since chrome_run |
| 725 # depends upon chrome). This results in not picking up | 725 # depends upon chrome). This results in not picking up |
| 726 # NaclIntegrationTest as it depends upon chrome not chrome_run. | 726 # NaclIntegrationTest as it depends upon chrome not chrome_run. |
| 727 compile_targets = list(set(self.m.filter.matching_exes + compile_targets)) | 727 compile_targets = list(set(self.m.filter.matching_exes + compile_targets)) |
| 728 | 728 |
| 729 # Add crash_service to compile_targets. This is done after filtering compile | |
| 730 # targets out because crash_service should always be there on windows. | |
| 731 # TODO(akuegel): Need to solve this in a better way. crbug/478053 | |
|
Sergiy Byelozyorov
2015/04/17 12:44:31
s/crbug/crbug.com/
Adrian Kuegel
2015/04/17 12:47:04
Done.
| |
| 732 if (self.m.platform.is_win and compile_targets and | |
| 733 'crash_service' not in compile_targets): | |
| 734 compile_targets.extend(['crash_service']) | |
| 735 | |
| 736 | |
| 729 # Emit more detailed output useful for debugging. | 737 # Emit more detailed output useful for debugging. |
| 730 analyze_details = { | 738 analyze_details = { |
| 731 'original_exes': original_exes, | 739 'original_exes': original_exes, |
| 732 'original_compile_targets': original_compile_targets, | 740 'original_compile_targets': original_compile_targets, |
| 733 'compile_targets': compile_targets, | 741 'compile_targets': compile_targets, |
| 734 'self.m.filter.compile_targets': self.m.filter.compile_targets, | 742 'self.m.filter.compile_targets': self.m.filter.compile_targets, |
| 735 'self.m.filter.matching_exes': self.m.filter.matching_exes, | 743 'self.m.filter.matching_exes': self.m.filter.matching_exes, |
| 736 } | 744 } |
| 737 with contextlib.closing(recipe_util.StringListIO()) as listio: | 745 with contextlib.closing(recipe_util.StringListIO()) as listio: |
| 738 json.dump(analyze_details, listio, indent=2, sort_keys=True) | 746 json.dump(analyze_details, listio, indent=2, sort_keys=True) |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 799 master_config.get('build_gs_bucket'), | 807 master_config.get('build_gs_bucket'), |
| 800 extra_url_components=None) | 808 extra_url_components=None) |
| 801 elif (mastername == 'tryserver.chromium.perf' or | 809 elif (mastername == 'tryserver.chromium.perf' or |
| 802 (mastername == 'tryserver.chromium.linux' and | 810 (mastername == 'tryserver.chromium.linux' and |
| 803 buildername == 'linux_full_bisect_builder')): | 811 buildername == 'linux_full_bisect_builder')): |
| 804 return None | 812 return None |
| 805 else: | 813 else: |
| 806 return self.m.archive.legacy_upload_url( | 814 return self.m.archive.legacy_upload_url( |
| 807 master_config.get('build_gs_bucket'), | 815 master_config.get('build_gs_bucket'), |
| 808 extra_url_components=self.m.properties['mastername']) | 816 extra_url_components=self.m.properties['mastername']) |
| OLD | NEW |