| 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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 # Mac | 355 # Mac |
| 356 ################################################################################ | 356 ################################################################################ |
| 357 { | 357 { |
| 358 'master': 'Chromium', | 358 'master': 'Chromium', |
| 359 'hostname': 'xserve6-m1', | 359 'hostname': 'xserve6-m1', |
| 360 'builder': 'Mac Builder', | 360 'builder': 'Mac Builder', |
| 361 'os': 'mac', | 361 'os': 'mac', |
| 362 'version': '10.6', | 362 'version': '10.6', |
| 363 'bits': '64', | 363 'bits': '64', |
| 364 }, | 364 }, |
| 365 { | 365 # { |
| 366 'master': 'Chromium', | 366 # 'master': 'Chromium', |
| 367 'hostname': 'vm612-m1', | 367 # 'hostname': 'vm612-m1', |
| 368 'builder': 'Mac10.5 Tests (1)', | 368 # 'builder': 'Mac10.7 Tests (1)', |
| 369 'os': 'mac', | 369 # 'os': 'mac', |
| 370 'version': '10.5', | 370 # 'version': '10.7', |
| 371 'bits': '64', | 371 # 'bits': '64', |
| 372 }, | 372 # }, |
| 373 { | 373 # { |
| 374 'master': 'Chromium', | 374 # 'master': 'Chromium', |
| 375 'hostname': 'vm613-m1', | 375 # 'hostname': 'vm613-m1', |
| 376 'builder': 'Mac10.5 Tests (2)', | 376 # 'builder': 'Mac10.7 Tests (2)', |
| 377 'os': 'mac', | 377 # 'os': 'mac', |
| 378 'version': '10.5', | 378 # 'version': '10.7', |
| 379 'bits': '64', | 379 # 'bits': '64', |
| 380 }, | 380 # }, |
| 381 { | 381 # { |
| 382 'master': 'Chromium', | 382 # 'master': 'Chromium', |
| 383 'hostname': 'vm614-m1', | 383 # 'hostname': 'vm614-m1', |
| 384 'builder': 'Mac10.5 Tests (3)', | 384 # 'builder': 'Mac10.7 Tests (3)', |
| 385 'os': 'mac', | 385 # 'os': 'mac', |
| 386 'version': '10.5', | 386 # 'version': '10.7', |
| 387 'bits': '64', | 387 # 'bits': '64', |
| 388 }, | 388 # }, |
| 389 { | 389 { |
| 390 'master': 'Chromium', | 390 'master': 'Chromium', |
| 391 'hostname': 'vm603-m1', | 391 'hostname': 'vm603-m1', |
| 392 'builder': 'Mac10.6 Tests (1)', | 392 'builder': 'Mac10.6 Tests (1)', |
| 393 'os': 'mac', | 393 'os': 'mac', |
| 394 'version': '10.6', | 394 'version': '10.6', |
| 395 'bits': '64', | 395 'bits': '64', |
| 396 }, | 396 }, |
| 397 { | 397 { |
| 398 'master': 'Chromium', | 398 'master': 'Chromium', |
| (...skipping 12 matching lines...) Expand all Loading... |
| 411 'bits': '64', | 411 'bits': '64', |
| 412 }, | 412 }, |
| 413 { | 413 { |
| 414 'master': 'Chromium', | 414 'master': 'Chromium', |
| 415 'hostname': 'xserve3-m1', | 415 'hostname': 'xserve3-m1', |
| 416 'builder': 'Mac Builder (dbg)', | 416 'builder': 'Mac Builder (dbg)', |
| 417 'os': 'mac', | 417 'os': 'mac', |
| 418 'version': '10.6', | 418 'version': '10.6', |
| 419 'bits': '64', | 419 'bits': '64', |
| 420 }, | 420 }, |
| 421 { | 421 # { |
| 422 'master': 'Chromium', | 422 # 'master': 'Chromium', |
| 423 'hostname': 'vm615-m1', | 423 # 'hostname': 'vm615-m1', |
| 424 'builder': 'Mac 10.5 Tests (dbg)(1)', | 424 # 'builder': 'Mac 10.7 Tests (dbg)(1)', |
| 425 'os': 'mac', | 425 # 'os': 'mac', |
| 426 'version': '10.5', | 426 # 'version': '10.7', |
| 427 'bits': '64', | 427 # 'bits': '64', |
| 428 }, | 428 # }, |
| 429 { | 429 # { |
| 430 'master': 'Chromium', | 430 # 'master': 'Chromium', |
| 431 'hostname': 'vm616-m1', | 431 # 'hostname': 'vm616-m1', |
| 432 'builder': 'Mac 10.5 Tests (dbg)(2)', | 432 # 'builder': 'Mac 10.7 Tests (dbg)(2)', |
| 433 'os': 'mac', | 433 # 'os': 'mac', |
| 434 'version': '10.5', | 434 # 'version': '10.7', |
| 435 'bits': '64', | 435 # 'bits': '64', |
| 436 }, | 436 # }, |
| 437 { | 437 # { |
| 438 'master': 'Chromium', | 438 # 'master': 'Chromium', |
| 439 'hostname': 'vm617-m1', | 439 # 'hostname': 'vm617-m1', |
| 440 'builder': 'Mac 10.5 Tests (dbg)(3)', | 440 # 'builder': 'Mac 10.7 Tests (dbg)(3)', |
| 441 'os': 'mac', | 441 # 'os': 'mac', |
| 442 'version': '10.5', | 442 # 'version': '10.7', |
| 443 'bits': '64', | 443 # 'bits': '64', |
| 444 }, | 444 # }, |
| 445 { | 445 # { |
| 446 'master': 'Chromium', | 446 # 'master': 'Chromium', |
| 447 'hostname': 'vm618-m1', | 447 # 'hostname': 'vm618-m1', |
| 448 'builder': 'Mac 10.5 Tests (dbg)(4)', | 448 # 'builder': 'Mac 10.7 Tests (dbg)(4)', |
| 449 'os': 'mac', | 449 # 'os': 'mac', |
| 450 'version': '10.5', | 450 # 'version': '10.7', |
| 451 'bits': '64', | 451 # 'bits': '64', |
| 452 }, | 452 # }, |
| 453 { | 453 { |
| 454 'master': 'Chromium', | 454 'master': 'Chromium', |
| 455 'hostname': 'vm606-m1', | 455 'hostname': 'vm606-m1', |
| 456 'builder': 'Mac 10.6 Tests (dbg)(1)', | 456 'builder': 'Mac 10.6 Tests (dbg)(1)', |
| 457 'os': 'mac', | 457 'os': 'mac', |
| 458 'version': '10.6', | 458 'version': '10.6', |
| 459 'bits': '64', | 459 'bits': '64', |
| 460 }, | 460 }, |
| 461 { | 461 { |
| 462 'master': 'Chromium', | 462 'master': 'Chromium', |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 ################################################################################ | 562 ################################################################################ |
| 563 { | 563 { |
| 564 'master': 'Chromium', | 564 'master': 'Chromium', |
| 565 'hostname': 'vm138-m1', | 565 'hostname': 'vm138-m1', |
| 566 'builder': 'Android Builder', | 566 'builder': 'Android Builder', |
| 567 'os': 'linux', | 567 'os': 'linux', |
| 568 'version': 'lucid', | 568 'version': 'lucid', |
| 569 'bits': '64', | 569 'bits': '64', |
| 570 }, | 570 }, |
| 571 ] | 571 ] |
| OLD | NEW |