| 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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 for c in self.bot_config.get('chromium_apply_config', []): | 113 for c in self.bot_config.get('chromium_apply_config', []): |
| 114 self.m.chromium.apply_config(c) | 114 self.m.chromium.apply_config(c) |
| 115 for c in self.bot_config.get('gclient_apply_config', []): | 115 for c in self.bot_config.get('gclient_apply_config', []): |
| 116 self.m.gclient.apply_config(c) | 116 self.m.gclient.apply_config(c) |
| 117 for c in self.recipe_config.get('gclient_apply_config', []): | 117 for c in self.recipe_config.get('gclient_apply_config', []): |
| 118 self.m.gclient.apply_config(c) | 118 self.m.gclient.apply_config(c) |
| 119 | 119 |
| 120 # Apply MB config (to avoid heavy duplication in builders.py). See | 120 # Apply MB config (to avoid heavy duplication in builders.py). See |
| 121 # crbug.com/589510 for more info. | 121 # crbug.com/589510 for more info. |
| 122 if (mastername in ('client.webrtc', 'tryserver.webrtc') and | 122 if (mastername in ('client.webrtc', 'tryserver.webrtc') and |
| 123 buildername.lower().startswith('linux')): | 123 (buildername.lower().startswith('linux') or |
| 124 buildername.lower().startswith('android'))): |
| 124 self.m.chromium.apply_config('mb') | 125 self.m.chromium.apply_config('mb') |
| 125 | 126 |
| 126 if self.m.tryserver.is_tryserver: | 127 if self.m.tryserver.is_tryserver: |
| 127 self.m.chromium.apply_config('trybot_flavor') | 128 self.m.chromium.apply_config('trybot_flavor') |
| 128 | 129 |
| 129 self.c.use_isolate = self.bot_config.get('use_isolate') | 130 self.c.use_isolate = self.bot_config.get('use_isolate') |
| 130 if self.c.use_isolate: | 131 if self.c.use_isolate: |
| 131 self.m.isolate.set_isolate_environment(self.m.chromium.c) | 132 self.m.isolate.set_isolate_environment(self.m.chromium.c) |
| 132 | 133 |
| 133 self.c.enable_swarming = self.bot_config.get('enable_swarming') | 134 self.c.enable_swarming = self.bot_config.get('enable_swarming') |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 def clean_test_output(self): | 316 def clean_test_output(self): |
| 316 """Remove all test output in out/, since we have tests leaking files.""" | 317 """Remove all test output in out/, since we have tests leaking files.""" |
| 317 out_dir = self.m.path['checkout'].join('out') | 318 out_dir = self.m.path['checkout'].join('out') |
| 318 self.m.python('clean test output files', | 319 self.m.python('clean test output files', |
| 319 script=self.resource('cleanup_files.py'), | 320 script=self.resource('cleanup_files.py'), |
| 320 args=[out_dir], | 321 args=[out_dir], |
| 321 infra_step=True) | 322 infra_step=True) |
| 322 | 323 |
| 323 def virtual_webcam_check(self): | 324 def virtual_webcam_check(self): |
| 324 self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py')) | 325 self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py')) |
| OLD | NEW |