| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 bot_config.get('gclient_config'), | 113 bot_config.get('gclient_config'), |
| 114 PATCH_PROJECT=self.m.properties.get('patch_project'), | 114 PATCH_PROJECT=self.m.properties.get('patch_project'), |
| 115 BUILDSPEC_VERSION=buildspec_version, | 115 BUILDSPEC_VERSION=buildspec_version, |
| 116 **bot_config.get('gclient_config_kwargs', {})) | 116 **bot_config.get('gclient_config_kwargs', {})) |
| 117 | 117 |
| 118 if bot_config.get('android_config'): | 118 if bot_config.get('android_config'): |
| 119 self.m.chromium_android.configure_from_properties( | 119 self.m.chromium_android.configure_from_properties( |
| 120 bot_config.get('android_config'), | 120 bot_config.get('android_config'), |
| 121 **bot_config.get('chromium_config_kwargs', {})) | 121 **bot_config.get('chromium_config_kwargs', {})) |
| 122 | 122 |
| 123 if bot_config.get('amp_config'): | |
| 124 self.m.amp.set_config(bot_config.get('amp_config')) | |
| 125 | |
| 126 for c in bot_config.get('chromium_apply_config', []): | 123 for c in bot_config.get('chromium_apply_config', []): |
| 127 self.m.chromium.apply_config(c) | 124 self.m.chromium.apply_config(c) |
| 128 | 125 |
| 129 for c in bot_config.get('gclient_apply_config', []): | 126 for c in bot_config.get('gclient_apply_config', []): |
| 130 self.m.gclient.apply_config(c) | 127 self.m.gclient.apply_config(c) |
| 131 | 128 |
| 132 # WARNING: src-side runtest.py is only tested with chromium CQ builders. | 129 # WARNING: src-side runtest.py is only tested with chromium CQ builders. |
| 133 # Usage not covered by chromium CQ is not supported and can break | 130 # Usage not covered by chromium CQ is not supported and can break |
| 134 # without notice. | 131 # without notice. |
| 135 if bot_config.get_master_setting('src_side_runtest_py'): | 132 if bot_config.get_master_setting('src_side_runtest_py'): |
| (...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 839 def get_compile_targets_for_scripts(self): | 836 def get_compile_targets_for_scripts(self): |
| 840 return self.m.python( | 837 return self.m.python( |
| 841 name='get compile targets for scripts', | 838 name='get compile targets for scripts', |
| 842 script=self.m.path['checkout'].join( | 839 script=self.m.path['checkout'].join( |
| 843 'testing', 'scripts', 'get_compile_targets.py'), | 840 'testing', 'scripts', 'get_compile_targets.py'), |
| 844 args=[ | 841 args=[ |
| 845 '--output', self.m.json.output(), | 842 '--output', self.m.json.output(), |
| 846 '--', | 843 '--', |
| 847 ] + self.get_common_args_for_scripts(), | 844 ] + self.get_common_args_for_scripts(), |
| 848 step_test_data=lambda: self.m.json.test_api.output({})) | 845 step_test_data=lambda: self.m.json.test_api.output({})) |
| OLD | NEW |