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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 | 96 |
97 if not parent_buildername: | 97 if not parent_buildername: |
98 parent_buildername = builders[platform][target_bits] | 98 parent_buildername = builders[platform][target_bits] |
99 spec['parent_buildername'] = parent_buildername | 99 spec['parent_buildername'] = parent_buildername |
100 spec['perf-id'] = perf_id | 100 spec['perf-id'] = perf_id |
101 spec['results-url'] = 'https://chromeperf.appspot.com' | 101 spec['results-url'] = 'https://chromeperf.appspot.com' |
102 | 102 |
103 return spec | 103 return spec |
104 | 104 |
105 | 105 |
| 106 def _AddIsolatedTestSpec(name, perf_id, platform, target_bits=64): |
| 107 spec = TestSpec('chromium_perf', perf_id, platform, target_bits) |
| 108 spec['enable_swarming'] = True |
| 109 SPEC['builders'][name] = spec |
| 110 |
| 111 |
106 def _AddBuildSpec( | 112 def _AddBuildSpec( |
107 name, platform, target_bits=64, add_to_bisect=False, enable_swarming=False): | 113 name, platform, target_bits=64, add_to_bisect=False, enable_swarming=False): |
108 if target_bits == 64: | 114 if target_bits == 64: |
109 perf_id = platform | 115 perf_id = platform |
110 else: | 116 else: |
111 perf_id = '%s-%d' % (platform, target_bits) | 117 perf_id = '%s-%d' % (platform, target_bits) |
112 | 118 |
113 SPEC['builders'][name] = BuildSpec( | 119 SPEC['builders'][name] = BuildSpec( |
114 'chromium_perf', perf_id, platform, target_bits, enable_swarming) | 120 'chromium_perf', perf_id, platform, target_bits, enable_swarming) |
115 assert target_bits not in builders[platform] | 121 assert target_bits not in builders[platform] |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 | 181 |
176 | 182 |
177 _AddTestSpec('Mac 10.11 Perf', 'chromium-rel-mac11', 'mac', | 183 _AddTestSpec('Mac 10.11 Perf', 'chromium-rel-mac11', 'mac', |
178 num_host_shards=5) | 184 num_host_shards=5) |
179 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac', | 185 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac', |
180 num_host_shards=5) | 186 num_host_shards=5) |
181 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac', | 187 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac', |
182 num_host_shards=5) | 188 num_host_shards=5) |
183 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', | 189 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', |
184 num_host_shards=5) | 190 num_host_shards=5) |
| 191 _AddIsolatedTestSpec('Mac Pro 10.11 Perf', 'chromium-rel-mac11-pro', 'mac') |
| 192 _AddIsolatedTestSpec('Mac Air 10.11 Perf', 'chromium-rel-mac11-air', 'mac') |
185 | 193 |
186 | 194 |
187 _AddTestSpec('Linux Perf', 'linux-release', 'linux', | 195 _AddTestSpec('Linux Perf', 'linux-release', 'linux', |
188 num_host_shards=5) | 196 num_host_shards=5) |
OLD | NEW |