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 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 "swarming": { | 304 "swarming": { |
305 "can_use_on_swarming_builders": true | 305 "can_use_on_swarming_builders": true |
306 }, | 306 }, |
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 }, | |
315 { | |
316 "isolate_name": "telemetry_perf_unittests", | |
317 "name": "telemetry_perf_unittests" | |
318 } | 314 } |
319 ], | 315 ], |
320 "scripts": [ | 316 "scripts": [ |
321 { | 317 { |
322 "name": "telemetry_unittests", | 318 "name": "telemetry_unittests", |
323 "script": "telemetry_unittests.py" | 319 "script": "telemetry_unittests.py" |
324 }, | 320 }, |
325 { | 321 { |
| 322 "name": "telemetry_perf_unittests", |
| 323 "script": "telemetry_perf_unittests.py" |
| 324 }, |
| 325 { |
326 "name": "nacl_integration", | 326 "name": "nacl_integration", |
327 "script": "nacl_integration.py" | 327 "script": "nacl_integration.py" |
328 } | 328 } |
329 ] | 329 ] |
330 }, | 330 }, |
331 "Mac10.6 Tests": { | 331 "Mac10.6 Tests": { |
332 "gtest_tests": [ | 332 "gtest_tests": [ |
333 { | 333 { |
334 "swarming": { | 334 "swarming": { |
335 "can_use_on_swarming_builders": true | 335 "can_use_on_swarming_builders": true |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
587 "swarming": { | 587 "swarming": { |
588 "can_use_on_swarming_builders": true | 588 "can_use_on_swarming_builders": true |
589 }, | 589 }, |
590 "test": "url_unittests" | 590 "test": "url_unittests" |
591 } | 591 } |
592 ], | 592 ], |
593 "isolated_scripts": [ | 593 "isolated_scripts": [ |
594 { | 594 { |
595 "isolate_name": "telemetry_gpu_unittests", | 595 "isolate_name": "telemetry_gpu_unittests", |
596 "name": "telemetry_gpu_unittests" | 596 "name": "telemetry_gpu_unittests" |
597 }, | |
598 { | |
599 "isolate_name": "telemetry_perf_unittests", | |
600 "name": "telemetry_perf_unittests" | |
601 } | 597 } |
602 ], | 598 ], |
603 "scripts": [ | 599 "scripts": [ |
604 { | 600 { |
605 "name": "telemetry_unittests", | 601 "name": "telemetry_unittests", |
606 "script": "telemetry_unittests.py" | 602 "script": "telemetry_unittests.py" |
607 }, | 603 }, |
608 { | 604 { |
| 605 "name": "telemetry_perf_unittests", |
| 606 "script": "telemetry_perf_unittests.py" |
| 607 }, |
| 608 { |
609 "name": "nacl_integration", | 609 "name": "nacl_integration", |
610 "script": "nacl_integration.py" | 610 "script": "nacl_integration.py" |
611 } | 611 } |
612 ] | 612 ] |
613 }, | 613 }, |
614 "Mac10.8 Tests": { | 614 "Mac10.8 Tests": { |
615 "gtest_tests": [ | 615 "gtest_tests": [ |
616 { | 616 { |
617 "swarming": { | 617 "swarming": { |
618 "can_use_on_swarming_builders": true | 618 "can_use_on_swarming_builders": true |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
870 "swarming": { | 870 "swarming": { |
871 "can_use_on_swarming_builders": true | 871 "can_use_on_swarming_builders": true |
872 }, | 872 }, |
873 "test": "url_unittests" | 873 "test": "url_unittests" |
874 } | 874 } |
875 ], | 875 ], |
876 "isolated_scripts": [ | 876 "isolated_scripts": [ |
877 { | 877 { |
878 "isolate_name": "telemetry_gpu_unittests", | 878 "isolate_name": "telemetry_gpu_unittests", |
879 "name": "telemetry_gpu_unittests" | 879 "name": "telemetry_gpu_unittests" |
880 }, | |
881 { | |
882 "isolate_name": "telemetry_perf_unittests", | |
883 "name": "telemetry_perf_unittests" | |
884 } | 880 } |
885 ], | 881 ], |
886 "scripts": [ | 882 "scripts": [ |
887 { | 883 { |
888 "name": "telemetry_unittests", | 884 "name": "telemetry_unittests", |
889 "script": "telemetry_unittests.py" | 885 "script": "telemetry_unittests.py" |
890 }, | 886 }, |
891 { | 887 { |
| 888 "name": "telemetry_perf_unittests", |
| 889 "script": "telemetry_perf_unittests.py" |
| 890 }, |
| 891 { |
892 "name": "nacl_integration", | 892 "name": "nacl_integration", |
893 "script": "nacl_integration.py" | 893 "script": "nacl_integration.py" |
894 } | 894 } |
895 ] | 895 ] |
896 }, | 896 }, |
897 "Mac10.9 Tests": { | 897 "Mac10.9 Tests": { |
898 "gtest_tests": [ | 898 "gtest_tests": [ |
899 { | 899 { |
900 "swarming": { | 900 "swarming": { |
901 "can_use_on_swarming_builders": true | 901 "can_use_on_swarming_builders": true |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1153 "swarming": { | 1153 "swarming": { |
1154 "can_use_on_swarming_builders": true | 1154 "can_use_on_swarming_builders": true |
1155 }, | 1155 }, |
1156 "test": "url_unittests" | 1156 "test": "url_unittests" |
1157 } | 1157 } |
1158 ], | 1158 ], |
1159 "isolated_scripts": [ | 1159 "isolated_scripts": [ |
1160 { | 1160 { |
1161 "isolate_name": "telemetry_gpu_unittests", | 1161 "isolate_name": "telemetry_gpu_unittests", |
1162 "name": "telemetry_gpu_unittests" | 1162 "name": "telemetry_gpu_unittests" |
1163 }, | |
1164 { | |
1165 "isolate_name": "telemetry_perf_unittests", | |
1166 "name": "telemetry_perf_unittests" | |
1167 } | 1163 } |
1168 ], | 1164 ], |
1169 "scripts": [ | 1165 "scripts": [ |
1170 { | 1166 { |
1171 "name": "telemetry_unittests", | 1167 "name": "telemetry_unittests", |
1172 "script": "telemetry_unittests.py" | 1168 "script": "telemetry_unittests.py" |
1173 }, | 1169 }, |
1174 { | 1170 { |
| 1171 "name": "telemetry_perf_unittests", |
| 1172 "script": "telemetry_perf_unittests.py" |
| 1173 }, |
| 1174 { |
1175 "name": "nacl_integration", | 1175 "name": "nacl_integration", |
1176 "script": "nacl_integration.py" | 1176 "script": "nacl_integration.py" |
1177 } | 1177 } |
1178 ] | 1178 ] |
1179 }, | 1179 }, |
1180 "Mac10.9 Tests (dbg)": { | 1180 "Mac10.9 Tests (dbg)": { |
1181 "gtest_tests": [ | 1181 "gtest_tests": [ |
1182 { | 1182 { |
1183 "swarming": { | 1183 "swarming": { |
1184 "can_use_on_swarming_builders": true | 1184 "can_use_on_swarming_builders": true |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1437 "swarming": { | 1437 "swarming": { |
1438 "can_use_on_swarming_builders": true | 1438 "can_use_on_swarming_builders": true |
1439 }, | 1439 }, |
1440 "test": "url_unittests" | 1440 "test": "url_unittests" |
1441 } | 1441 } |
1442 ], | 1442 ], |
1443 "isolated_scripts": [ | 1443 "isolated_scripts": [ |
1444 { | 1444 { |
1445 "isolate_name": "telemetry_gpu_unittests", | 1445 "isolate_name": "telemetry_gpu_unittests", |
1446 "name": "telemetry_gpu_unittests" | 1446 "name": "telemetry_gpu_unittests" |
1447 }, | |
1448 { | |
1449 "isolate_name": "telemetry_perf_unittests", | |
1450 "name": "telemetry_perf_unittests" | |
1451 } | 1447 } |
1452 ], | 1448 ], |
1453 "scripts": [ | 1449 "scripts": [ |
1454 { | 1450 { |
1455 "name": "telemetry_unittests", | 1451 "name": "telemetry_unittests", |
1456 "script": "telemetry_unittests.py" | 1452 "script": "telemetry_unittests.py" |
1457 }, | 1453 }, |
1458 { | 1454 { |
| 1455 "name": "telemetry_perf_unittests", |
| 1456 "script": "telemetry_perf_unittests.py" |
| 1457 }, |
| 1458 { |
1459 "name": "nacl_integration", | 1459 "name": "nacl_integration", |
1460 "script": "nacl_integration.py" | 1460 "script": "nacl_integration.py" |
1461 } | 1461 } |
1462 ] | 1462 ] |
1463 } | 1463 } |
1464 } | 1464 } |
OLD | NEW |