| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 | 6 |
| 7 from . import steps | 7 from . import steps |
| 8 | 8 |
| 9 import DEPS | 9 import DEPS |
| 10 CHROMIUM_CONFIG_CTX = DEPS['chromium'].CONFIG_CTX | 10 CHROMIUM_CONFIG_CTX = DEPS['chromium'].CONFIG_CTX |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 spec['android_config'] = 'chromium_perf' | 51 spec['android_config'] = 'chromium_perf' |
| 52 spec['chromium_apply_config'] = ['android'] | 52 spec['chromium_apply_config'] = ['android'] |
| 53 spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm' | 53 spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm' |
| 54 spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android' | 54 spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android' |
| 55 spec['gclient_apply_config'] = ['android'] | 55 spec['gclient_apply_config'] = ['android'] |
| 56 | 56 |
| 57 return spec | 57 return spec |
| 58 | 58 |
| 59 | 59 |
| 60 def BuildSpec( | 60 def BuildSpec( |
| 61 config_name, perf_id, platform, target_bits, enable_swarming=False): | 61 config_name, perf_id, platform, target_bits, enable_swarming=False, |
| 62 extra_compile_targets=None): |
| 62 if platform == 'android': | 63 if platform == 'android': |
| 63 # TODO: Run sizes on Android. | 64 # TODO: Run sizes on Android. |
| 64 tests = [] | 65 tests = [] |
| 65 else: | 66 else: |
| 66 tests = [steps.SizesStep('https://chromeperf.appspot.com', perf_id)] | 67 tests = [steps.SizesStep('https://chromeperf.appspot.com', perf_id)] |
| 67 | 68 |
| 68 spec = _BaseSpec( | 69 spec = _BaseSpec( |
| 69 bot_type='builder', | 70 bot_type='builder', |
| 70 config_name=config_name, | 71 config_name=config_name, |
| 71 platform=platform, | 72 platform=platform, |
| 72 target_bits=target_bits, | 73 target_bits=target_bits, |
| 73 tests=tests, | 74 tests=tests, |
| 74 ) | 75 ) |
| 75 | 76 |
| 76 if enable_swarming: | 77 if enable_swarming: |
| 77 spec['enable_swarming'] = True | 78 spec['enable_swarming'] = True |
| 78 spec['use_isolate'] = True | 79 spec['use_isolate'] = True |
| 79 spec['compile_targets'] = ['chromium_builder_perf'] | 80 spec['compile_targets'] = ['chromium_builder_perf'] |
| 81 if extra_compile_targets: |
| 82 spec['compile_targets'] += extra_compile_targets |
| 80 | 83 |
| 81 return spec | 84 return spec |
| 82 | 85 |
| 83 | 86 |
| 84 def TestSpec(config_name, perf_id, platform, target_bits, | 87 def TestSpec(config_name, perf_id, platform, target_bits, |
| 85 parent_buildername=None, tests=None): | 88 parent_buildername=None, tests=None): |
| 86 spec = _BaseSpec( | 89 spec = _BaseSpec( |
| 87 bot_type='tester', | 90 bot_type='tester', |
| 88 config_name=config_name, | 91 config_name=config_name, |
| 89 platform=platform, | 92 platform=platform, |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac', | 179 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac', |
| 177 num_host_shards=5) | 180 num_host_shards=5) |
| 178 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac', | 181 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac', |
| 179 num_host_shards=5) | 182 num_host_shards=5) |
| 180 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', | 183 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', |
| 181 num_host_shards=5) | 184 num_host_shards=5) |
| 182 | 185 |
| 183 | 186 |
| 184 _AddTestSpec('Linux Perf', 'linux-release', 'linux', | 187 _AddTestSpec('Linux Perf', 'linux-release', 'linux', |
| 185 num_host_shards=5) | 188 num_host_shards=5) |
| OLD | NEW |