| 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 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 'os': 'mac', | 67 'os': 'mac', |
| 68 'version': '10.9', | 68 'version': '10.9', |
| 69 }, | 69 }, |
| 70 { | 70 { |
| 71 'master': 'ChromiumMac', | 71 'master': 'ChromiumMac', |
| 72 'hostname': 'vm618-m1', | 72 'hostname': 'vm618-m1', |
| 73 'builder': 'ios-simulator', | 73 'builder': 'ios-simulator', |
| 74 'os': 'mac', | 74 'os': 'mac', |
| 75 'version': '10.9', | 75 'version': '10.9', |
| 76 }, | 76 }, |
| 77 { | |
| 78 'master': 'ChromiumMac', | |
| 79 'hostname': 'vm18-m1', | |
| 80 'builder': 'ios-device-gn', | |
| 81 'os': 'mac', | |
| 82 'version': '10.9', | |
| 83 }, | |
| 84 { | |
| 85 'master': 'ChromiumMac', | |
| 86 'hostname': 'vm21-m1', | |
| 87 'builder': 'ios-simulator-gn', | |
| 88 'os': 'mac', | |
| 89 'version': '10.9', | |
| 90 }, | |
| 91 { | |
| 92 'master': 'ChromiumMac', | |
| 93 'hostname': 'vm617-m1', | |
| 94 'builder': ['Mac GYP', 'Mac GYP (dbg)'], | |
| 95 'os': 'mac', | |
| 96 'version': '10.9', | |
| 97 'bits': '64', | |
| 98 } | |
| 99 ] | 77 ] |
| OLD | NEW |