| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # ex: set syntax=python: | 2 # ex: set syntax=python: |
| 3 | 3 |
| 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 4 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
| 6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
| 7 | 7 |
| 8 # See master.experimental/slaves.cfg for documentation. | 8 # See master.experimental/slaves.cfg for documentation. |
| 9 | 9 |
| 10 | 10 |
| 11 slaves = [ | 11 slaves = [ |
| 12 ################################################################################ | 12 ################################################################################ |
| 13 # Mac | 13 # Mac |
| 14 ################################################################################ | 14 ################################################################################ |
| 15 # { | 15 # { |
| 16 # 'master': 'Chromium', | 16 # 'master': 'Chromium', |
| 17 # 'hostname': 'xserve6-m1', | 17 # 'hostname': 'xserve6-m1', |
| 18 # 'builder': 'Mac Builder', | 18 # 'builder': 'Mac Builder', |
| 19 # 'os': 'mac', | 19 # 'os': 'mac', |
| 20 # 'version': '10.6', | 20 # 'version': '10.6', |
| 21 # 'bits': '64', | 21 # 'bits': '64', |
| 22 # }, | 22 # }, |
| 23 # { | 23 ## { |
| 24 # 'master': 'Chromium', | 24 ## 'master': 'Chromium', |
| 25 # 'hostname': 'vm612-m1', | 25 ## 'hostname': 'vm612-m1', |
| 26 # 'builder': 'Mac10.5 Tests (1)', | 26 ## 'builder': 'Mac10.7 Tests (1)', |
| 27 # 'os': 'mac', | 27 ## 'os': 'mac', |
| 28 # 'version': '10.5', | 28 ## 'version': '10.7', |
| 29 # 'bits': '64', | 29 ## 'bits': '64', |
| 30 # }, | 30 ## }, |
| 31 # { | 31 ## { |
| 32 # 'master': 'Chromium', | 32 ## 'master': 'Chromium', |
| 33 # 'hostname': 'vm613-m1', | 33 ## 'hostname': 'vm613-m1', |
| 34 # 'builder': 'Mac10.5 Tests (2)', | 34 ## 'builder': 'Mac10.7 Tests (2)', |
| 35 # 'os': 'mac', | 35 ## 'os': 'mac', |
| 36 # 'version': '10.5', | 36 ## 'version': '10.7', |
| 37 # 'bits': '64', | 37 ## 'bits': '64', |
| 38 # }, | 38 ## }, |
| 39 # { | 39 ## { |
| 40 # 'master': 'Chromium', | 40 ## 'master': 'Chromium', |
| 41 # 'hostname': 'vm614-m1', | 41 ## 'hostname': 'vm614-m1', |
| 42 # 'builder': 'Mac10.5 Tests (3)', | 42 ## 'builder': 'Mac10.7 Tests (3)', |
| 43 # 'os': 'mac', | 43 ## 'os': 'mac', |
| 44 # 'version': '10.5', | 44 ## 'version': '10.7', |
| 45 # 'bits': '64', | 45 ## 'bits': '64', |
| 46 # }, | 46 ## }, |
| 47 # { | 47 # { |
| 48 # 'master': 'Chromium', | 48 # 'master': 'Chromium', |
| 49 # 'hostname': 'vm603-m1', | 49 # 'hostname': 'vm603-m1', |
| 50 # 'builder': 'Mac10.6 Tests (1)', | 50 # 'builder': 'Mac10.6 Tests (1)', |
| 51 # 'os': 'mac', | 51 # 'os': 'mac', |
| 52 # 'version': '10.6', | 52 # 'version': '10.6', |
| 53 # 'bits': '64', | 53 # 'bits': '64', |
| 54 # }, | 54 # }, |
| 55 # { | 55 # { |
| 56 # 'master': 'Chromium', | 56 # 'master': 'Chromium', |
| (...skipping 12 matching lines...) Expand all Loading... |
| 69 # 'bits': '64', | 69 # 'bits': '64', |
| 70 # }, | 70 # }, |
| 71 # { | 71 # { |
| 72 # 'master': 'Chromium', | 72 # 'master': 'Chromium', |
| 73 # 'hostname': 'xserve3-m1', | 73 # 'hostname': 'xserve3-m1', |
| 74 # 'builder': 'Mac Builder (dbg)', | 74 # 'builder': 'Mac Builder (dbg)', |
| 75 # 'os': 'mac', | 75 # 'os': 'mac', |
| 76 # 'version': '10.6', | 76 # 'version': '10.6', |
| 77 # 'bits': '64', | 77 # 'bits': '64', |
| 78 # }, | 78 # }, |
| 79 # { | 79 ## { |
| 80 # 'master': 'Chromium', | 80 ## 'master': 'Chromium', |
| 81 # 'hostname': 'vm615-m1', | 81 ## 'hostname': 'vm615-m1', |
| 82 # 'builder': 'Mac 10.5 Tests (dbg)(1)', | 82 ## 'builder': 'Mac 10.7 Tests (dbg)(1)', |
| 83 # 'os': 'mac', | 83 ## 'os': 'mac', |
| 84 # 'version': '10.5', | 84 ## 'version': '10.7', |
| 85 # 'bits': '64', | 85 ## 'bits': '64', |
| 86 # }, | 86 ## }, |
| 87 # { | 87 ## { |
| 88 # 'master': 'Chromium', | 88 ## 'master': 'Chromium', |
| 89 # 'hostname': 'vm616-m1', | 89 ## 'hostname': 'vm616-m1', |
| 90 # 'builder': 'Mac 10.5 Tests (dbg)(2)', | 90 ## 'builder': 'Mac 10.7 Tests (dbg)(2)', |
| 91 # 'os': 'mac', | 91 ## 'os': 'mac', |
| 92 # 'version': '10.5', | 92 ## 'version': '10.7', |
| 93 # 'bits': '64', | 93 ## 'bits': '64', |
| 94 # }, | 94 ## }, |
| 95 # { | 95 ## { |
| 96 # 'master': 'Chromium', | 96 ## 'master': 'Chromium', |
| 97 # 'hostname': 'vm617-m1', | 97 ## 'hostname': 'vm617-m1', |
| 98 # 'builder': 'Mac 10.5 Tests (dbg)(3)', | 98 ## 'builder': 'Mac 10.7 Tests (dbg)(3)', |
| 99 # 'os': 'mac', | 99 ## 'os': 'mac', |
| 100 # 'version': '10.5', | 100 ## 'version': '10.7', |
| 101 # 'bits': '64', | 101 ## 'bits': '64', |
| 102 # }, | 102 ## }, |
| 103 # { | 103 ## { |
| 104 # 'master': 'Chromium', | 104 ## 'master': 'Chromium', |
| 105 # 'hostname': 'vm618-m1', | 105 ## 'hostname': 'vm618-m1', |
| 106 # 'builder': 'Mac 10.5 Tests (dbg)(4)', | 106 ## 'builder': 'Mac 10.7 Tests (dbg)(4)', |
| 107 # 'os': 'mac', | 107 ## 'os': 'mac', |
| 108 # 'version': '10.5', | 108 ## 'version': '10.7', |
| 109 # 'bits': '64', | 109 ## 'bits': '64', |
| 110 # }, | 110 ## }, |
| 111 # { | 111 # { |
| 112 # 'master': 'Chromium', | 112 # 'master': 'Chromium', |
| 113 # 'hostname': 'vm606-m1', | 113 # 'hostname': 'vm606-m1', |
| 114 # 'builder': 'Mac 10.6 Tests (dbg)(1)', | 114 # 'builder': 'Mac 10.6 Tests (dbg)(1)', |
| 115 # 'os': 'mac', | 115 # 'os': 'mac', |
| 116 # 'version': '10.6', | 116 # 'version': '10.6', |
| 117 # 'bits': '64', | 117 # 'bits': '64', |
| 118 # }, | 118 # }, |
| 119 # { | 119 # { |
| 120 # 'master': 'Chromium', | 120 # 'master': 'Chromium', |
| (...skipping 21 matching lines...) Expand all Loading... |
| 142 # }, | 142 # }, |
| 143 # { | 143 # { |
| 144 # 'master': 'Chromium', | 144 # 'master': 'Chromium', |
| 145 # 'builder': 'Mac10.6 Sync', | 145 # 'builder': 'Mac10.6 Sync', |
| 146 # 'hostname': 'mini19-m1', | 146 # 'hostname': 'mini19-m1', |
| 147 # 'os': 'mac', | 147 # 'os': 'mac', |
| 148 # 'version': '10.6', | 148 # 'version': '10.6', |
| 149 # 'bits': '64', | 149 # 'bits': '64', |
| 150 # }, | 150 # }, |
| 151 ] | 151 ] |
| OLD | NEW |