| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 from recipe_engine.types import freeze | 5 from recipe_engine.types import freeze |
| 6 from recipe_engine import recipe_api | 6 from recipe_engine import recipe_api |
| 7 from . import builders | 7 from . import builders |
| 8 from . import steps | 8 from . import steps |
| 9 | 9 |
| 10 | 10 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 TEST_SUITE=self.recipe_config.get('test_suite'), | 100 TEST_SUITE=self.recipe_config.get('test_suite'), |
| 101 **self.bot_config.get('webrtc_config_kwargs', {})) | 101 **self.bot_config.get('webrtc_config_kwargs', {})) |
| 102 | 102 |
| 103 chromium_kwargs = self.bot_config.get('chromium_config_kwargs', {}) | 103 chromium_kwargs = self.bot_config.get('chromium_config_kwargs', {}) |
| 104 if self.recipe_config.get('chromium_android_config'): | 104 if self.recipe_config.get('chromium_android_config'): |
| 105 self.m.chromium_android.set_config( | 105 self.m.chromium_android.set_config( |
| 106 self.recipe_config['chromium_android_config'], **chromium_kwargs) | 106 self.recipe_config['chromium_android_config'], **chromium_kwargs) |
| 107 | 107 |
| 108 self.m.chromium.set_config(self.recipe_config['chromium_config'], | 108 self.m.chromium.set_config(self.recipe_config['chromium_config'], |
| 109 **chromium_kwargs) | 109 **chromium_kwargs) |
| 110 self.m.gclient.set_config(self.recipe_config['gclient_config']) | 110 self.m.gclient.set_config(self.recipe_config['gclient_config'], |
| 111 GIT_MODE=True) |
| 111 | 112 |
| 112 # Support applying configs both at the bot and the recipe config level. | 113 # Support applying configs both at the bot and the recipe config level. |
| 113 for c in self.bot_config.get('chromium_apply_config', []): | 114 for c in self.bot_config.get('chromium_apply_config', []): |
| 114 self.m.chromium.apply_config(c) | 115 self.m.chromium.apply_config(c) |
| 115 for c in self.bot_config.get('gclient_apply_config', []): | 116 for c in self.bot_config.get('gclient_apply_config', []): |
| 116 self.m.gclient.apply_config(c) | 117 self.m.gclient.apply_config(c) |
| 117 for c in self.recipe_config.get('gclient_apply_config', []): | 118 for c in self.recipe_config.get('gclient_apply_config', []): |
| 118 self.m.gclient.apply_config(c) | 119 self.m.gclient.apply_config(c) |
| 119 | 120 |
| 120 # Apply MB config (to avoid heavy duplication in builders.py). See | 121 # Apply MB config (to avoid heavy duplication in builders.py). See |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 def clean_test_output(self): | 318 def clean_test_output(self): |
| 318 """Remove all test output in out/, since we have tests leaking files.""" | 319 """Remove all test output in out/, since we have tests leaking files.""" |
| 319 out_dir = self.m.path['checkout'].join('out') | 320 out_dir = self.m.path['checkout'].join('out') |
| 320 self.m.python('clean test output files', | 321 self.m.python('clean test output files', |
| 321 script=self.resource('cleanup_files.py'), | 322 script=self.resource('cleanup_files.py'), |
| 322 args=[out_dir], | 323 args=[out_dir], |
| 323 infra_step=True) | 324 infra_step=True) |
| 324 | 325 |
| 325 def virtual_webcam_check(self): | 326 def virtual_webcam_check(self): |
| 326 self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py')) | 327 self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py')) |
| OLD | NEW |