| 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 27 matching lines...) Expand all Loading... |
| 38 @property | 38 @property |
| 39 def out_path(self): | 39 def out_path(self): |
| 40 return self.m.path['checkout'].join('out') | 40 return self.m.path['checkout'].join('out') |
| 41 | 41 |
| 42 @property | 42 @property |
| 43 def coverage_dir(self): | 43 def coverage_dir(self): |
| 44 return self.out_path.join(self.c.BUILD_CONFIG, 'coverage') | 44 return self.out_path.join(self.c.BUILD_CONFIG, 'coverage') |
| 45 | 45 |
| 46 @property | 46 @property |
| 47 def known_devices_file(self): | 47 def known_devices_file(self): |
| 48 # TODO(phajdan.jr): Remove path['build'] usage, http://crbug.com/437264 . | 48 return self.m.path['cache'].join('known_android_devices') |
| 49 return self.m.path['build'].join('site_config', '.known_devices') | |
| 50 | 49 |
| 51 @property | 50 @property |
| 52 def file_changes_path(self): | 51 def file_changes_path(self): |
| 53 """Get or create the path to the file containing changes for this revision. | 52 """Get or create the path to the file containing changes for this revision. |
| 54 | 53 |
| 55 This file will contain a dict mapping file paths to lists of changed lines | 54 This file will contain a dict mapping file paths to lists of changed lines |
| 56 for each file. This is used to generate incremental coverage reports. | 55 for each file. This is used to generate incremental coverage reports. |
| 57 """ | 56 """ |
| 58 if not self._file_changes_path: | 57 if not self._file_changes_path: |
| 59 self._file_changes_path = ( | 58 self._file_changes_path = ( |
| (...skipping 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1360 script = self.c.test_runner | 1359 script = self.c.test_runner |
| 1361 if wrapper_script_suite_name: | 1360 if wrapper_script_suite_name: |
| 1362 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1361 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1363 wrapper_script_suite_name) | 1362 wrapper_script_suite_name) |
| 1364 else: | 1363 else: |
| 1365 env = kwargs.get('env', {}) | 1364 env = kwargs.get('env', {}) |
| 1366 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1365 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1367 self.m.chromium.output_dir) | 1366 self.m.chromium.output_dir) |
| 1368 kwargs['env'] = env | 1367 kwargs['env'] = env |
| 1369 return self.m.python(step_name, script, args, **kwargs) | 1368 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |