| 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 import contextlib | 5 import contextlib |
| 6 import datetime | 6 import datetime |
| 7 import json | 7 import json |
| 8 import os | 8 import os |
| 9 import re | 9 import re |
| 10 import sys | 10 import sys |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 result = self.m.gclient.checkout( | 126 result = self.m.gclient.checkout( |
| 127 spec, with_branch_heads=with_branch_heads) | 127 spec, with_branch_heads=with_branch_heads) |
| 128 | 128 |
| 129 # TODO(sivachandra): Manufacture gclient spec such that it contains "src" | 129 # TODO(sivachandra): Manufacture gclient spec such that it contains "src" |
| 130 # solution + repo_name solution. Then checkout will be automatically | 130 # solution + repo_name solution. Then checkout will be automatically |
| 131 # correctly set by gclient.checkout | 131 # correctly set by gclient.checkout |
| 132 self.m.path['checkout'] = self.m.path['slave_build'].join('src') | 132 self.m.path['checkout'] = self.m.path['slave_build'].join('src') |
| 133 | 133 |
| 134 self.clean_local_files() | 134 self.clean_local_files() |
| 135 | 135 |
| 136 if gclient_config != 'android_bare': # pragma: no cover |
| 137 self.m.step('hihihihihi', ['echo', 'supbreh']) |
| 138 |
| 136 return result | 139 return result |
| 137 | 140 |
| 138 def clean_local_files(self): | 141 def clean_local_files(self): |
| 139 target = self.c.BUILD_CONFIG | 142 target = self.c.BUILD_CONFIG |
| 140 debug_info_dumps = self.m.path['checkout'].join('out', | 143 debug_info_dumps = self.m.path['checkout'].join('out', |
| 141 target, | 144 target, |
| 142 'debug_info_dumps') | 145 'debug_info_dumps') |
| 143 test_logs = self.m.path['checkout'].join('out', target, 'test_logs') | 146 test_logs = self.m.path['checkout'].join('out', target, 'test_logs') |
| 144 build_product = self.m.path['checkout'].join('out', 'build_product.zip') | 147 build_product = self.m.path['checkout'].join('out', 'build_product.zip') |
| 145 self.m.python.inline( | 148 self.m.python.inline( |
| (...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1359 script = self.c.test_runner | 1362 script = self.c.test_runner |
| 1360 if wrapper_script_suite_name: | 1363 if wrapper_script_suite_name: |
| 1361 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1364 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1362 wrapper_script_suite_name) | 1365 wrapper_script_suite_name) |
| 1363 else: | 1366 else: |
| 1364 env = kwargs.get('env', {}) | 1367 env = kwargs.get('env', {}) |
| 1365 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1368 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1366 self.m.chromium.output_dir) | 1369 self.m.chromium.output_dir) |
| 1367 kwargs['env'] = env | 1370 kwargs['env'] = env |
| 1368 return self.m.python(step_name, script, args, **kwargs) | 1371 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |