| OLD | NEW |
| 1 { | 1 { |
| 2 "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, | 2 "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, |
| 3 "AAAAA2 See generate_buildbot_json.py to make changes": {}, | 3 "AAAAA2 See generate_buildbot_json.py to make changes": {}, |
| 4 "GPU Linux Builder": {}, | 4 "GPU Linux Builder": {}, |
| 5 "GPU Linux Builder (dbg)": {}, | 5 "GPU Linux Builder (dbg)": {}, |
| 6 "GPU Mac Builder": {}, | 6 "GPU Mac Builder": {}, |
| 7 "GPU Mac Builder (dbg)": {}, | 7 "GPU Mac Builder (dbg)": {}, |
| 8 "GPU Win Builder": {}, | 8 "GPU Win Builder": {}, |
| 9 "GPU Win Builder (dbg)": {}, | 9 "GPU Win Builder (dbg)": {}, |
| 10 "Linux Debug (NVIDIA)": { | 10 "Linux Debug (NVIDIA)": { |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 ], | 31 ], |
| 32 "swarming": { | 32 "swarming": { |
| 33 "can_use_on_swarming_builders": true, | 33 "can_use_on_swarming_builders": true, |
| 34 "dimension_sets": [ | 34 "dimension_sets": [ |
| 35 { | 35 { |
| 36 "gpu": "10de:104a", | 36 "gpu": "10de:104a", |
| 37 "os": "Linux" | 37 "os": "Linux" |
| 38 } | 38 } |
| 39 ] | 39 ] |
| 40 }, | 40 }, |
| 41 "test": "content_gl_tests", | |
| 42 "use_xvfb": false | |
| 43 }, | |
| 44 { | |
| 45 "args": [ | |
| 46 "--use-gpu-in-tests" | |
| 47 ], | |
| 48 "swarming": { | |
| 49 "can_use_on_swarming_builders": true, | |
| 50 "dimension_sets": [ | |
| 51 { | |
| 52 "gpu": "10de:104a", | |
| 53 "os": "Linux" | |
| 54 } | |
| 55 ] | |
| 56 }, | |
| 57 "test": "gl_tests", | 41 "test": "gl_tests", |
| 58 "use_xvfb": false | 42 "use_xvfb": false |
| 59 }, | 43 }, |
| 60 { | 44 { |
| 61 "args": [ | 45 "args": [ |
| 62 "--use-gpu-in-tests" | 46 "--use-gpu-in-tests" |
| 63 ], | 47 ], |
| 64 "swarming": { | 48 "swarming": { |
| 65 "can_use_on_swarming_builders": true, | 49 "can_use_on_swarming_builders": true, |
| 66 "dimension_sets": [ | 50 "dimension_sets": [ |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 ], | 329 ], |
| 346 "swarming": { | 330 "swarming": { |
| 347 "can_use_on_swarming_builders": true, | 331 "can_use_on_swarming_builders": true, |
| 348 "dimension_sets": [ | 332 "dimension_sets": [ |
| 349 { | 333 { |
| 350 "gpu": "10de:104a", | 334 "gpu": "10de:104a", |
| 351 "os": "Linux" | 335 "os": "Linux" |
| 352 } | 336 } |
| 353 ] | 337 ] |
| 354 }, | 338 }, |
| 355 "test": "content_gl_tests", | |
| 356 "use_xvfb": false | |
| 357 }, | |
| 358 { | |
| 359 "args": [ | |
| 360 "--use-gpu-in-tests" | |
| 361 ], | |
| 362 "swarming": { | |
| 363 "can_use_on_swarming_builders": true, | |
| 364 "dimension_sets": [ | |
| 365 { | |
| 366 "gpu": "10de:104a", | |
| 367 "os": "Linux" | |
| 368 } | |
| 369 ] | |
| 370 }, | |
| 371 "test": "gl_tests", | 339 "test": "gl_tests", |
| 372 "use_xvfb": false | 340 "use_xvfb": false |
| 373 }, | 341 }, |
| 374 { | 342 { |
| 375 "args": [ | 343 "args": [ |
| 376 "--use-gpu-in-tests" | 344 "--use-gpu-in-tests" |
| 377 ], | 345 ], |
| 378 "swarming": { | 346 "swarming": { |
| 379 "can_use_on_swarming_builders": true, | 347 "can_use_on_swarming_builders": true, |
| 380 "dimension_sets": [ | 348 "dimension_sets": [ |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 ], | 643 ], |
| 676 "swarming": { | 644 "swarming": { |
| 677 "can_use_on_swarming_builders": true, | 645 "can_use_on_swarming_builders": true, |
| 678 "dimension_sets": [ | 646 "dimension_sets": [ |
| 679 { | 647 { |
| 680 "gpu": "8086:0a2e", | 648 "gpu": "8086:0a2e", |
| 681 "os": "Mac-10.10" | 649 "os": "Mac-10.10" |
| 682 } | 650 } |
| 683 ] | 651 ] |
| 684 }, | 652 }, |
| 685 "test": "content_gl_tests", | |
| 686 "use_xvfb": false | |
| 687 }, | |
| 688 { | |
| 689 "args": [ | |
| 690 "--use-gpu-in-tests" | |
| 691 ], | |
| 692 "swarming": { | |
| 693 "can_use_on_swarming_builders": true, | |
| 694 "dimension_sets": [ | |
| 695 { | |
| 696 "gpu": "8086:0a2e", | |
| 697 "os": "Mac-10.10" | |
| 698 } | |
| 699 ] | |
| 700 }, | |
| 701 "test": "gl_tests", | 653 "test": "gl_tests", |
| 702 "use_xvfb": false | 654 "use_xvfb": false |
| 703 }, | 655 }, |
| 704 { | 656 { |
| 705 "args": [ | 657 "args": [ |
| 706 "--use-gpu-in-tests" | 658 "--use-gpu-in-tests" |
| 707 ], | 659 ], |
| 708 "swarming": { | 660 "swarming": { |
| 709 "can_use_on_swarming_builders": true, | 661 "can_use_on_swarming_builders": true, |
| 710 "dimension_sets": [ | 662 "dimension_sets": [ |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 989 ], | 941 ], |
| 990 "swarming": { | 942 "swarming": { |
| 991 "can_use_on_swarming_builders": true, | 943 "can_use_on_swarming_builders": true, |
| 992 "dimension_sets": [ | 944 "dimension_sets": [ |
| 993 { | 945 { |
| 994 "gpu": "8086:0a2e", | 946 "gpu": "8086:0a2e", |
| 995 "os": "Mac-10.10" | 947 "os": "Mac-10.10" |
| 996 } | 948 } |
| 997 ] | 949 ] |
| 998 }, | 950 }, |
| 999 "test": "content_gl_tests", | |
| 1000 "use_xvfb": false | |
| 1001 }, | |
| 1002 { | |
| 1003 "args": [ | |
| 1004 "--use-gpu-in-tests" | |
| 1005 ], | |
| 1006 "swarming": { | |
| 1007 "can_use_on_swarming_builders": true, | |
| 1008 "dimension_sets": [ | |
| 1009 { | |
| 1010 "gpu": "8086:0a2e", | |
| 1011 "os": "Mac-10.10" | |
| 1012 } | |
| 1013 ] | |
| 1014 }, | |
| 1015 "test": "gl_tests", | 951 "test": "gl_tests", |
| 1016 "use_xvfb": false | 952 "use_xvfb": false |
| 1017 }, | 953 }, |
| 1018 { | 954 { |
| 1019 "args": [ | 955 "args": [ |
| 1020 "--use-gpu-in-tests" | 956 "--use-gpu-in-tests" |
| 1021 ], | 957 ], |
| 1022 "swarming": { | 958 "swarming": { |
| 1023 "can_use_on_swarming_builders": true, | 959 "can_use_on_swarming_builders": true, |
| 1024 "dimension_sets": [ | 960 "dimension_sets": [ |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1321 "swarming": { | 1257 "swarming": { |
| 1322 "can_use_on_swarming_builders": true, | 1258 "can_use_on_swarming_builders": true, |
| 1323 "dimension_sets": [ | 1259 "dimension_sets": [ |
| 1324 { | 1260 { |
| 1325 "gpu": "1002:6821", | 1261 "gpu": "1002:6821", |
| 1326 "hidpi": "1", | 1262 "hidpi": "1", |
| 1327 "os": "Mac-10.10" | 1263 "os": "Mac-10.10" |
| 1328 } | 1264 } |
| 1329 ] | 1265 ] |
| 1330 }, | 1266 }, |
| 1331 "test": "content_gl_tests", | |
| 1332 "use_xvfb": false | |
| 1333 }, | |
| 1334 { | |
| 1335 "args": [ | |
| 1336 "--use-gpu-in-tests" | |
| 1337 ], | |
| 1338 "swarming": { | |
| 1339 "can_use_on_swarming_builders": true, | |
| 1340 "dimension_sets": [ | |
| 1341 { | |
| 1342 "gpu": "1002:6821", | |
| 1343 "hidpi": "1", | |
| 1344 "os": "Mac-10.10" | |
| 1345 } | |
| 1346 ] | |
| 1347 }, | |
| 1348 "test": "gl_tests", | 1267 "test": "gl_tests", |
| 1349 "use_xvfb": false | 1268 "use_xvfb": false |
| 1350 }, | 1269 }, |
| 1351 { | 1270 { |
| 1352 "args": [ | 1271 "args": [ |
| 1353 "--use-gpu-in-tests" | 1272 "--use-gpu-in-tests" |
| 1354 ], | 1273 ], |
| 1355 "swarming": { | 1274 "swarming": { |
| 1356 "can_use_on_swarming_builders": true, | 1275 "can_use_on_swarming_builders": true, |
| 1357 "dimension_sets": [ | 1276 "dimension_sets": [ |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1649 "swarming": { | 1568 "swarming": { |
| 1650 "can_use_on_swarming_builders": true, | 1569 "can_use_on_swarming_builders": true, |
| 1651 "dimension_sets": [ | 1570 "dimension_sets": [ |
| 1652 { | 1571 { |
| 1653 "gpu": "1002:6821", | 1572 "gpu": "1002:6821", |
| 1654 "hidpi": "1", | 1573 "hidpi": "1", |
| 1655 "os": "Mac-10.10" | 1574 "os": "Mac-10.10" |
| 1656 } | 1575 } |
| 1657 ] | 1576 ] |
| 1658 }, | 1577 }, |
| 1659 "test": "content_gl_tests", | |
| 1660 "use_xvfb": false | |
| 1661 }, | |
| 1662 { | |
| 1663 "args": [ | |
| 1664 "--use-gpu-in-tests" | |
| 1665 ], | |
| 1666 "swarming": { | |
| 1667 "can_use_on_swarming_builders": true, | |
| 1668 "dimension_sets": [ | |
| 1669 { | |
| 1670 "gpu": "1002:6821", | |
| 1671 "hidpi": "1", | |
| 1672 "os": "Mac-10.10" | |
| 1673 } | |
| 1674 ] | |
| 1675 }, | |
| 1676 "test": "gl_tests", | 1578 "test": "gl_tests", |
| 1677 "use_xvfb": false | 1579 "use_xvfb": false |
| 1678 }, | 1580 }, |
| 1679 { | 1581 { |
| 1680 "args": [ | 1582 "args": [ |
| 1681 "--use-gpu-in-tests" | 1583 "--use-gpu-in-tests" |
| 1682 ], | 1584 ], |
| 1683 "swarming": { | 1585 "swarming": { |
| 1684 "can_use_on_swarming_builders": true, | 1586 "can_use_on_swarming_builders": true, |
| 1685 "dimension_sets": [ | 1587 "dimension_sets": [ |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2087 ], | 1989 ], |
| 2088 "swarming": { | 1990 "swarming": { |
| 2089 "can_use_on_swarming_builders": true, | 1991 "can_use_on_swarming_builders": true, |
| 2090 "dimension_sets": [ | 1992 "dimension_sets": [ |
| 2091 { | 1993 { |
| 2092 "gpu": "10de:104a", | 1994 "gpu": "10de:104a", |
| 2093 "os": "Windows-2008ServerR2-SP1" | 1995 "os": "Windows-2008ServerR2-SP1" |
| 2094 } | 1996 } |
| 2095 ] | 1997 ] |
| 2096 }, | 1998 }, |
| 2097 "test": "content_gl_tests", | |
| 2098 "use_xvfb": false | |
| 2099 }, | |
| 2100 { | |
| 2101 "args": [ | |
| 2102 "--use-gpu-in-tests" | |
| 2103 ], | |
| 2104 "swarming": { | |
| 2105 "can_use_on_swarming_builders": true, | |
| 2106 "dimension_sets": [ | |
| 2107 { | |
| 2108 "gpu": "10de:104a", | |
| 2109 "os": "Windows-2008ServerR2-SP1" | |
| 2110 } | |
| 2111 ] | |
| 2112 }, | |
| 2113 "test": "gl_tests", | 1999 "test": "gl_tests", |
| 2114 "use_xvfb": false | 2000 "use_xvfb": false |
| 2115 }, | 2001 }, |
| 2116 { | 2002 { |
| 2117 "args": [ | 2003 "args": [ |
| 2118 "--use-gpu-in-tests" | 2004 "--use-gpu-in-tests" |
| 2119 ], | 2005 ], |
| 2120 "swarming": { | 2006 "swarming": { |
| 2121 "can_use_on_swarming_builders": true, | 2007 "can_use_on_swarming_builders": true, |
| 2122 "dimension_sets": [ | 2008 "dimension_sets": [ |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2401 ], | 2287 ], |
| 2402 "swarming": { | 2288 "swarming": { |
| 2403 "can_use_on_swarming_builders": true, | 2289 "can_use_on_swarming_builders": true, |
| 2404 "dimension_sets": [ | 2290 "dimension_sets": [ |
| 2405 { | 2291 { |
| 2406 "gpu": "1002:6779", | 2292 "gpu": "1002:6779", |
| 2407 "os": "Windows-2008ServerR2-SP1" | 2293 "os": "Windows-2008ServerR2-SP1" |
| 2408 } | 2294 } |
| 2409 ] | 2295 ] |
| 2410 }, | 2296 }, |
| 2411 "test": "content_gl_tests", | |
| 2412 "use_xvfb": false | |
| 2413 }, | |
| 2414 { | |
| 2415 "args": [ | |
| 2416 "--use-gpu-in-tests" | |
| 2417 ], | |
| 2418 "swarming": { | |
| 2419 "can_use_on_swarming_builders": true, | |
| 2420 "dimension_sets": [ | |
| 2421 { | |
| 2422 "gpu": "1002:6779", | |
| 2423 "os": "Windows-2008ServerR2-SP1" | |
| 2424 } | |
| 2425 ] | |
| 2426 }, | |
| 2427 "test": "gl_tests", | 2297 "test": "gl_tests", |
| 2428 "use_xvfb": false | 2298 "use_xvfb": false |
| 2429 }, | 2299 }, |
| 2430 { | 2300 { |
| 2431 "args": [ | 2301 "args": [ |
| 2432 "--use-gpu-in-tests" | 2302 "--use-gpu-in-tests" |
| 2433 ], | 2303 ], |
| 2434 "swarming": { | 2304 "swarming": { |
| 2435 "can_use_on_swarming_builders": true, | 2305 "can_use_on_swarming_builders": true, |
| 2436 "dimension_sets": [ | 2306 "dimension_sets": [ |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2731 ], | 2601 ], |
| 2732 "swarming": { | 2602 "swarming": { |
| 2733 "can_use_on_swarming_builders": true, | 2603 "can_use_on_swarming_builders": true, |
| 2734 "dimension_sets": [ | 2604 "dimension_sets": [ |
| 2735 { | 2605 { |
| 2736 "gpu": "10de:104a", | 2606 "gpu": "10de:104a", |
| 2737 "os": "Windows-2008ServerR2-SP1" | 2607 "os": "Windows-2008ServerR2-SP1" |
| 2738 } | 2608 } |
| 2739 ] | 2609 ] |
| 2740 }, | 2610 }, |
| 2741 "test": "content_gl_tests", | |
| 2742 "use_xvfb": false | |
| 2743 }, | |
| 2744 { | |
| 2745 "args": [ | |
| 2746 "--use-gpu-in-tests" | |
| 2747 ], | |
| 2748 "swarming": { | |
| 2749 "can_use_on_swarming_builders": true, | |
| 2750 "dimension_sets": [ | |
| 2751 { | |
| 2752 "gpu": "10de:104a", | |
| 2753 "os": "Windows-2008ServerR2-SP1" | |
| 2754 } | |
| 2755 ] | |
| 2756 }, | |
| 2757 "test": "gl_tests", | 2611 "test": "gl_tests", |
| 2758 "use_xvfb": false | 2612 "use_xvfb": false |
| 2759 }, | 2613 }, |
| 2760 { | 2614 { |
| 2761 "args": [ | 2615 "args": [ |
| 2762 "--use-gpu-in-tests" | 2616 "--use-gpu-in-tests" |
| 2763 ], | 2617 ], |
| 2764 "swarming": { | 2618 "swarming": { |
| 2765 "can_use_on_swarming_builders": true, | 2619 "can_use_on_swarming_builders": true, |
| 2766 "dimension_sets": [ | 2620 "dimension_sets": [ |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3031 { | 2885 { |
| 3032 "gpu": "10de:104a", | 2886 "gpu": "10de:104a", |
| 3033 "os": "Windows-2008ServerR2-SP1" | 2887 "os": "Windows-2008ServerR2-SP1" |
| 3034 } | 2888 } |
| 3035 ] | 2889 ] |
| 3036 } | 2890 } |
| 3037 } | 2891 } |
| 3038 ] | 2892 ] |
| 3039 } | 2893 } |
| 3040 } | 2894 } |
| OLD | NEW |