| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 # See master.experimental/slaves.cfg for documentation. | 7 # See master.experimental/slaves.cfg for documentation. |
| 8 | 8 |
| 9 | 9 |
| 10 def linux(): | 10 def linux(): |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 gpu_slaves = [ | 245 gpu_slaves = [ |
| 246 { | 246 { |
| 247 'master': 'TryServer', | 247 'master': 'TryServer', |
| 248 'builder': ['win_gpu'], | 248 'builder': ['win_gpu'], |
| 249 'hostname': 'gpuwin%d' % i, | 249 'hostname': 'gpuwin%d' % i, |
| 250 'os': 'win', | 250 'os': 'win', |
| 251 'version': 'win7', | 251 'version': 'win7', |
| 252 'bits': '64', | 252 'bits': '64', |
| 253 } for i in range(3, 6) | 253 } for i in range(3, 6) |
| 254 ] | 254 ] |
| 255 swarm_slave = [ |
| 256 { |
| 257 'master': 'TryServer', |
| 258 'builder': ['win_swarm'], |
| 259 'hostname': 'vm1-m4', |
| 260 'os': 'win', |
| 261 'version': 'win7', |
| 262 'bits': '64', |
| 263 } |
| 264 ] |
| 255 | 265 |
| 256 return ( | 266 return ( |
| 257 normal_slaves + | 267 normal_slaves + |
| 258 drmemory_slaves + | 268 drmemory_slaves + |
| 259 chromeframe_slave + | 269 chromeframe_slave + |
| 260 gpu_slaves) | 270 gpu_slaves + |
| 271 swarm_slave) |
| 261 | 272 |
| 262 | 273 |
| 263 slaves = linux() + mac() + windows() + cros() + android() + ios() | 274 slaves = linux() + mac() + windows() + cros() + android() + ios() |
| OLD | NEW |