| 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 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 795 # TODO(phajdan.jr): Remove buildnumber when no longer used. | 795 # TODO(phajdan.jr): Remove buildnumber when no longer used. |
| 796 | 796 |
| 797 mastername = self.m.properties.get('mastername') | 797 mastername = self.m.properties.get('mastername') |
| 798 buildername = self.m.properties.get('buildername') | 798 buildername = self.m.properties.get('buildername') |
| 799 master_dict = self.builders.get(mastername, {}) | 799 master_dict = self.builders.get(mastername, {}) |
| 800 bot_config = master_dict.get('builders', {}).get(buildername, {}) | 800 bot_config = master_dict.get('builders', {}).get(buildername, {}) |
| 801 | 801 |
| 802 for name in ('buildername', 'slavename', 'buildnumber', 'mastername'): | 802 for name in ('buildername', 'slavename', 'buildnumber', 'mastername'): |
| 803 properties[name] = self.m.properties[name] | 803 properties[name] = self.m.properties[name] |
| 804 | 804 |
| 805 # Optional properties | |
| 806 for name in ('perf-id', 'results-url'): | |
| 807 if bot_config.get(name): | |
| 808 properties[name] = bot_config[name] | |
| 809 | |
| 810 properties['target_platform'] = self.m.chromium.c.TARGET_PLATFORM | 805 properties['target_platform'] = self.m.chromium.c.TARGET_PLATFORM |
| 811 | 806 |
| 812 args.extend(['--properties', self.m.json.input(properties)]) | 807 args.extend(['--properties', self.m.json.input(properties)]) |
| 813 | 808 |
| 814 return args | 809 return args |
| 815 | 810 |
| 816 def get_compile_targets_for_scripts(self): | 811 def get_compile_targets_for_scripts(self): |
| 817 return self.m.python( | 812 return self.m.python( |
| 818 name='get compile targets for scripts', | 813 name='get compile targets for scripts', |
| 819 script=self.m.path['checkout'].join( | 814 script=self.m.path['checkout'].join( |
| 820 'testing', 'scripts', 'get_compile_targets.py'), | 815 'testing', 'scripts', 'get_compile_targets.py'), |
| 821 args=[ | 816 args=[ |
| 822 '--output', self.m.json.output(), | 817 '--output', self.m.json.output(), |
| 823 '--', | 818 '--', |
| 824 ] + self.get_common_args_for_scripts(), | 819 ] + self.get_common_args_for_scripts(), |
| 825 step_test_data=lambda: self.m.json.test_api.output({})) | 820 step_test_data=lambda: self.m.json.test_api.output({})) |
| OLD | NEW |