| OLD | NEW |
| 1 { | 1 { |
| 2 "Mac GN": { | 2 "Mac GN": { |
| 3 "additional_compile_targets": [ | 3 "additional_compile_targets": [ |
| 4 "gn_all" | 4 "gn_all" |
| 5 ], | 5 ], |
| 6 "gtest_tests": [ | 6 "gtest_tests": [ |
| 7 { | 7 { |
| 8 "test": "base_unittests" | 8 "test": "base_unittests" |
| 9 } | 9 } |
| 10 ] | 10 ] |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 "test": "url_unittests" | 307 "test": "url_unittests" |
| 308 } | 308 } |
| 309 ], | 309 ], |
| 310 "isolated_scripts": [ | 310 "isolated_scripts": [ |
| 311 { | 311 { |
| 312 "isolate_name": "telemetry_gpu_unittests", | 312 "isolate_name": "telemetry_gpu_unittests", |
| 313 "name": "telemetry_gpu_unittests", | 313 "name": "telemetry_gpu_unittests", |
| 314 "swarming": { | 314 "swarming": { |
| 315 "can_use_on_swarming_builders": true | 315 "can_use_on_swarming_builders": true |
| 316 } | 316 } |
| 317 }, |
| 318 { |
| 319 "isolate_name": "telemetry_perf_unittests", |
| 320 "name": "telemetry_perf_unittests", |
| 321 "swarming": { |
| 322 "can_use_on_swarming_builders": true |
| 323 } |
| 317 } | 324 } |
| 318 ], | 325 ], |
| 319 "scripts": [ | 326 "scripts": [ |
| 320 { | 327 { |
| 321 "name": "telemetry_unittests", | 328 "name": "telemetry_unittests", |
| 322 "script": "telemetry_unittests.py" | 329 "script": "telemetry_unittests.py" |
| 323 }, | 330 }, |
| 324 { | 331 { |
| 325 "name": "telemetry_perf_unittests", | |
| 326 "script": "telemetry_perf_unittests.py" | |
| 327 }, | |
| 328 { | |
| 329 "name": "nacl_integration", | 332 "name": "nacl_integration", |
| 330 "script": "nacl_integration.py" | 333 "script": "nacl_integration.py" |
| 331 } | 334 } |
| 332 ] | 335 ] |
| 333 }, | 336 }, |
| 334 "Mac10.6 Tests": { | 337 "Mac10.6 Tests": { |
| 335 "gtest_tests": [ | 338 "gtest_tests": [ |
| 336 { | 339 { |
| 337 "swarming": { | 340 "swarming": { |
| 338 "can_use_on_swarming_builders": true | 341 "can_use_on_swarming_builders": true |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 "test": "url_unittests" | 596 "test": "url_unittests" |
| 594 } | 597 } |
| 595 ], | 598 ], |
| 596 "isolated_scripts": [ | 599 "isolated_scripts": [ |
| 597 { | 600 { |
| 598 "isolate_name": "telemetry_gpu_unittests", | 601 "isolate_name": "telemetry_gpu_unittests", |
| 599 "name": "telemetry_gpu_unittests", | 602 "name": "telemetry_gpu_unittests", |
| 600 "swarming": { | 603 "swarming": { |
| 601 "can_use_on_swarming_builders": true | 604 "can_use_on_swarming_builders": true |
| 602 } | 605 } |
| 606 }, |
| 607 { |
| 608 "isolate_name": "telemetry_perf_unittests", |
| 609 "name": "telemetry_perf_unittests", |
| 610 "swarming": { |
| 611 "can_use_on_swarming_builders": true |
| 612 } |
| 603 } | 613 } |
| 604 ], | 614 ], |
| 605 "scripts": [ | 615 "scripts": [ |
| 606 { | 616 { |
| 607 "name": "telemetry_unittests", | 617 "name": "telemetry_unittests", |
| 608 "script": "telemetry_unittests.py" | 618 "script": "telemetry_unittests.py" |
| 609 }, | 619 }, |
| 610 { | 620 { |
| 611 "name": "telemetry_perf_unittests", | |
| 612 "script": "telemetry_perf_unittests.py" | |
| 613 }, | |
| 614 { | |
| 615 "name": "nacl_integration", | 621 "name": "nacl_integration", |
| 616 "script": "nacl_integration.py" | 622 "script": "nacl_integration.py" |
| 617 } | 623 } |
| 618 ] | 624 ] |
| 619 }, | 625 }, |
| 620 "Mac10.8 Tests": { | 626 "Mac10.8 Tests": { |
| 621 "gtest_tests": [ | 627 "gtest_tests": [ |
| 622 { | 628 { |
| 623 "swarming": { | 629 "swarming": { |
| 624 "can_use_on_swarming_builders": true | 630 "can_use_on_swarming_builders": true |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 879 "test": "url_unittests" | 885 "test": "url_unittests" |
| 880 } | 886 } |
| 881 ], | 887 ], |
| 882 "isolated_scripts": [ | 888 "isolated_scripts": [ |
| 883 { | 889 { |
| 884 "isolate_name": "telemetry_gpu_unittests", | 890 "isolate_name": "telemetry_gpu_unittests", |
| 885 "name": "telemetry_gpu_unittests", | 891 "name": "telemetry_gpu_unittests", |
| 886 "swarming": { | 892 "swarming": { |
| 887 "can_use_on_swarming_builders": true | 893 "can_use_on_swarming_builders": true |
| 888 } | 894 } |
| 895 }, |
| 896 { |
| 897 "isolate_name": "telemetry_perf_unittests", |
| 898 "name": "telemetry_perf_unittests", |
| 899 "swarming": { |
| 900 "can_use_on_swarming_builders": true |
| 901 } |
| 889 } | 902 } |
| 890 ], | 903 ], |
| 891 "scripts": [ | 904 "scripts": [ |
| 892 { | 905 { |
| 893 "name": "telemetry_unittests", | 906 "name": "telemetry_unittests", |
| 894 "script": "telemetry_unittests.py" | 907 "script": "telemetry_unittests.py" |
| 895 }, | 908 }, |
| 896 { | 909 { |
| 897 "name": "telemetry_perf_unittests", | |
| 898 "script": "telemetry_perf_unittests.py" | |
| 899 }, | |
| 900 { | |
| 901 "name": "nacl_integration", | 910 "name": "nacl_integration", |
| 902 "script": "nacl_integration.py" | 911 "script": "nacl_integration.py" |
| 903 } | 912 } |
| 904 ] | 913 ] |
| 905 }, | 914 }, |
| 906 "Mac10.9 Tests": { | 915 "Mac10.9 Tests": { |
| 907 "gtest_tests": [ | 916 "gtest_tests": [ |
| 908 { | 917 { |
| 909 "swarming": { | 918 "swarming": { |
| 910 "can_use_on_swarming_builders": true | 919 "can_use_on_swarming_builders": true |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1165 "test": "url_unittests" | 1174 "test": "url_unittests" |
| 1166 } | 1175 } |
| 1167 ], | 1176 ], |
| 1168 "isolated_scripts": [ | 1177 "isolated_scripts": [ |
| 1169 { | 1178 { |
| 1170 "isolate_name": "telemetry_gpu_unittests", | 1179 "isolate_name": "telemetry_gpu_unittests", |
| 1171 "name": "telemetry_gpu_unittests", | 1180 "name": "telemetry_gpu_unittests", |
| 1172 "swarming": { | 1181 "swarming": { |
| 1173 "can_use_on_swarming_builders": true | 1182 "can_use_on_swarming_builders": true |
| 1174 } | 1183 } |
| 1184 }, |
| 1185 { |
| 1186 "isolate_name": "telemetry_perf_unittests", |
| 1187 "name": "telemetry_perf_unittests" |
| 1175 } | 1188 } |
| 1176 ], | 1189 ], |
| 1177 "scripts": [ | 1190 "scripts": [ |
| 1178 { | 1191 { |
| 1179 "name": "telemetry_unittests", | 1192 "name": "telemetry_unittests", |
| 1180 "script": "telemetry_unittests.py" | 1193 "script": "telemetry_unittests.py" |
| 1181 }, | 1194 }, |
| 1182 { | 1195 { |
| 1183 "name": "telemetry_perf_unittests", | |
| 1184 "script": "telemetry_perf_unittests.py" | |
| 1185 }, | |
| 1186 { | |
| 1187 "name": "nacl_integration", | 1196 "name": "nacl_integration", |
| 1188 "script": "nacl_integration.py" | 1197 "script": "nacl_integration.py" |
| 1189 } | 1198 } |
| 1190 ] | 1199 ] |
| 1191 }, | 1200 }, |
| 1192 "Mac10.9 Tests (dbg)": { | 1201 "Mac10.9 Tests (dbg)": { |
| 1193 "gtest_tests": [ | 1202 "gtest_tests": [ |
| 1194 { | 1203 { |
| 1195 "swarming": { | 1204 "swarming": { |
| 1196 "can_use_on_swarming_builders": true | 1205 "can_use_on_swarming_builders": true |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1452 "test": "url_unittests" | 1461 "test": "url_unittests" |
| 1453 } | 1462 } |
| 1454 ], | 1463 ], |
| 1455 "isolated_scripts": [ | 1464 "isolated_scripts": [ |
| 1456 { | 1465 { |
| 1457 "isolate_name": "telemetry_gpu_unittests", | 1466 "isolate_name": "telemetry_gpu_unittests", |
| 1458 "name": "telemetry_gpu_unittests", | 1467 "name": "telemetry_gpu_unittests", |
| 1459 "swarming": { | 1468 "swarming": { |
| 1460 "can_use_on_swarming_builders": true | 1469 "can_use_on_swarming_builders": true |
| 1461 } | 1470 } |
| 1471 }, |
| 1472 { |
| 1473 "isolate_name": "telemetry_perf_unittests", |
| 1474 "name": "telemetry_perf_unittests" |
| 1462 } | 1475 } |
| 1463 ], | 1476 ], |
| 1464 "scripts": [ | 1477 "scripts": [ |
| 1465 { | 1478 { |
| 1466 "name": "telemetry_unittests", | 1479 "name": "telemetry_unittests", |
| 1467 "script": "telemetry_unittests.py" | 1480 "script": "telemetry_unittests.py" |
| 1468 }, | 1481 }, |
| 1469 { | 1482 { |
| 1470 "name": "telemetry_perf_unittests", | |
| 1471 "script": "telemetry_perf_unittests.py" | |
| 1472 }, | |
| 1473 { | |
| 1474 "name": "nacl_integration", | 1483 "name": "nacl_integration", |
| 1475 "script": "nacl_integration.py" | 1484 "script": "nacl_integration.py" |
| 1476 } | 1485 } |
| 1477 ] | 1486 ] |
| 1478 } | 1487 } |
| 1479 } | 1488 } |
| OLD | NEW |