Chromium Code Reviews| 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 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 793 extra_url_components=self.m.properties['mastername']) | 793 extra_url_components=self.m.properties['mastername']) |
| 794 | 794 |
| 795 def get_common_args_for_scripts(self): | 795 def get_common_args_for_scripts(self): |
| 796 args = [] | 796 args = [] |
| 797 | 797 |
| 798 args.extend(['--build-config-fs', self.m.chromium.c.build_config_fs]) | 798 args.extend(['--build-config-fs', self.m.chromium.c.build_config_fs]) |
| 799 | 799 |
| 800 if self.m.chromium.c.runtest_py.src_side: | 800 if self.m.chromium.c.runtest_py.src_side: |
| 801 args.append('--use-src-side-runtest-py') | 801 args.append('--use-src-side-runtest-py') |
| 802 | 802 |
| 803 paths = {} | 803 paths = { |
| 804 for path in ('build', 'checkout'): | 804 # TODO(phajdan.jr): Remove build path, http://crbug.com/593420 . |
|
iannucci
2016/03/10 17:54:32
maybe we should have another bug for this cleanup,
Paweł Hajdan Jr.
2016/03/10 17:56:18
No, it's just one CL in src, which will be tested
| |
| 805 paths[path] = self.m.path[path] | 805 'build': self.m.path['build'], |
|
iannucci
2016/03/10 17:54:32
I thought this one doesn't work on swarming?
Paweł Hajdan Jr.
2016/03/10 17:56:18
Correct. However, I can't remove it before fixing
| |
| 806 'checkout': self.m.path['checkout'], | |
| 807 'runit.py': self.package_repo_resource('scripts', 'tools', 'runit.py'), | |
| 808 'runtest.py': self.package_repo_resource( | |
| 809 'scripts', 'slave', 'runtest.py'), | |
| 810 } | |
| 806 args.extend(['--paths', self.m.json.input(paths)]) | 811 args.extend(['--paths', self.m.json.input(paths)]) |
| 807 | 812 |
| 808 properties = {} | 813 properties = {} |
| 809 # TODO(phajdan.jr): Remove buildnumber when no longer used. | 814 # TODO(phajdan.jr): Remove buildnumber when no longer used. |
| 810 | 815 |
| 811 mastername = self.m.properties.get('mastername') | 816 mastername = self.m.properties.get('mastername') |
| 812 buildername = self.m.properties.get('buildername') | 817 buildername = self.m.properties.get('buildername') |
| 813 master_dict = self.builders.get(mastername, {}) | 818 master_dict = self.builders.get(mastername, {}) |
| 814 bot_config = master_dict.get('builders', {}).get(buildername, {}) | 819 bot_config = master_dict.get('builders', {}).get(buildername, {}) |
| 815 | 820 |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 830 def get_compile_targets_for_scripts(self): | 835 def get_compile_targets_for_scripts(self): |
| 831 return self.m.python( | 836 return self.m.python( |
| 832 name='get compile targets for scripts', | 837 name='get compile targets for scripts', |
| 833 script=self.m.path['checkout'].join( | 838 script=self.m.path['checkout'].join( |
| 834 'testing', 'scripts', 'get_compile_targets.py'), | 839 'testing', 'scripts', 'get_compile_targets.py'), |
| 835 args=[ | 840 args=[ |
| 836 '--output', self.m.json.output(), | 841 '--output', self.m.json.output(), |
| 837 '--', | 842 '--', |
| 838 ] + self.get_common_args_for_scripts(), | 843 ] + self.get_common_args_for_scripts(), |
| 839 step_test_data=lambda: self.m.json.test_api.output({})) | 844 step_test_data=lambda: self.m.json.test_api.output({})) |
| OLD | NEW |