| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 slaves = [ | 5 slaves = [ |
| 6 # Linux | 6 # Linux |
| 7 { | 7 { |
| 8 'master': 'WebRTCFYI', | 8 'master': 'WebRTCFYI', |
| 9 'os': 'linux', | 9 'os': 'linux', |
| 10 'version': 'precise', | 10 'version': 'precise', |
| 11 'bits': '64', | 11 'bits': '64', |
| 12 'builder': [ | 12 'builder': [ |
| 13 'Linux LSan (and ASan)', | 13 'Linux LSan (and ASan)', |
| 14 'Linux TsanRV', | |
| 15 ], | 14 ], |
| 16 'hostname': 'vm%d-m3' % i, | 15 'hostname': 'vm31-m3', |
| 17 } for i in [4, 31] | 16 }, |
| 18 ] + [ | |
| 19 # Mac | |
| 20 { | |
| 21 'master': 'WebRTCFYI', | |
| 22 'os': 'mac', | |
| 23 'version': '10.6', # Notice 10.6 due to lack of Valgrind support on newer. | |
| 24 'bits': '64', | |
| 25 'builder': [ | |
| 26 'Mac 10.6 Memcheck', | |
| 27 'Mac 10.6 TSan', | |
| 28 ], | |
| 29 'hostname': 'vm%d-m3' % i, | |
| 30 } for i in [653, 665] | |
| 31 ] + [ | |
| 32 # Windows | 17 # Windows |
| 33 { | 18 { |
| 34 'master': 'WebRTCFYI', | 19 'master': 'WebRTCFYI', |
| 35 'os': 'win', | 20 'os': 'win', |
| 36 'version': 'win7', | 21 'version': 'win7', |
| 37 'bits': '64', | 22 'bits': '64', |
| 38 'builder': [ | 23 'builder': [ |
| 39 'Win Tsan', | 24 'Win Tsan', |
| 40 ], | 25 ], |
| 41 'hostname': 'vm%d-m3' % i, | 26 'hostname': 'vm193-m3', |
| 42 } for i in [193] | 27 } |
| 43 ] | 28 ] |
| OLD | NEW |