OLD | NEW |
1 { | 1 { |
2 "Mac GYP": { | 2 "Mac GYP": { |
3 "additional_compile_targets": [ | 3 "additional_compile_targets": [ |
4 "base_unittests", | 4 "base_unittests", |
5 "browser_tests", | 5 "browser_tests", |
6 "chrome", | 6 "chrome", |
7 "content_browsertests", | 7 "content_browsertests", |
8 "content_unittests", | 8 "content_unittests", |
9 "interactive_ui_tests", | 9 "interactive_ui_tests", |
10 "ipc_tests", | 10 "ipc_tests", |
11 "media_unittests", | 11 "media_unittests", |
12 "net_unittests", | 12 "net_unittests", |
13 "printing_unittests", | 13 "printing_unittests", |
14 "skia_unittests", | 14 "skia_unittests", |
15 "sql_unittests", | 15 "sql_unittests", |
| 16 "sync_unit_tests", |
16 "ui_base_unittests", | 17 "ui_base_unittests", |
17 "unit_tests", | 18 "unit_tests", |
18 "url_unittests" | 19 "url_unittests" |
19 ] | 20 ] |
20 }, | 21 }, |
21 "Mac GYP (dbg)": { | 22 "Mac GYP (dbg)": { |
22 "additional_compile_targets": [ | 23 "additional_compile_targets": [ |
23 "all" | 24 "all" |
24 ] | 25 ] |
25 }, | 26 }, |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
287 { | 288 { |
288 "swarming": { | 289 "swarming": { |
289 "can_use_on_swarming_builders": true | 290 "can_use_on_swarming_builders": true |
290 }, | 291 }, |
291 "test": "sync_integration_tests" | 292 "test": "sync_integration_tests" |
292 }, | 293 }, |
293 { | 294 { |
294 "swarming": { | 295 "swarming": { |
295 "can_use_on_swarming_builders": true | 296 "can_use_on_swarming_builders": true |
296 }, | 297 }, |
| 298 "test": "sync_unit_tests" |
| 299 }, |
| 300 { |
| 301 "swarming": { |
| 302 "can_use_on_swarming_builders": true |
| 303 }, |
297 "test": "ui_base_unittests" | 304 "test": "ui_base_unittests" |
298 }, | 305 }, |
299 { | 306 { |
300 "swarming": { | 307 "swarming": { |
301 "can_use_on_swarming_builders": true | 308 "can_use_on_swarming_builders": true |
302 }, | 309 }, |
303 "test": "unit_tests" | 310 "test": "unit_tests" |
304 }, | 311 }, |
305 { | 312 { |
306 "swarming": { | 313 "swarming": { |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
620 { | 627 { |
621 "swarming": { | 628 "swarming": { |
622 "can_use_on_swarming_builders": true | 629 "can_use_on_swarming_builders": true |
623 }, | 630 }, |
624 "test": "sync_integration_tests" | 631 "test": "sync_integration_tests" |
625 }, | 632 }, |
626 { | 633 { |
627 "swarming": { | 634 "swarming": { |
628 "can_use_on_swarming_builders": true | 635 "can_use_on_swarming_builders": true |
629 }, | 636 }, |
| 637 "test": "sync_unit_tests" |
| 638 }, |
| 639 { |
| 640 "swarming": { |
| 641 "can_use_on_swarming_builders": true |
| 642 }, |
630 "test": "ui_base_unittests" | 643 "test": "ui_base_unittests" |
631 }, | 644 }, |
632 { | 645 { |
633 "swarming": { | 646 "swarming": { |
634 "can_use_on_swarming_builders": true | 647 "can_use_on_swarming_builders": true |
635 }, | 648 }, |
636 "test": "unit_tests" | 649 "test": "unit_tests" |
637 }, | 650 }, |
638 { | 651 { |
639 "swarming": { | 652 "swarming": { |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
954 { | 967 { |
955 "swarming": { | 968 "swarming": { |
956 "can_use_on_swarming_builders": true | 969 "can_use_on_swarming_builders": true |
957 }, | 970 }, |
958 "test": "sync_integration_tests" | 971 "test": "sync_integration_tests" |
959 }, | 972 }, |
960 { | 973 { |
961 "swarming": { | 974 "swarming": { |
962 "can_use_on_swarming_builders": true | 975 "can_use_on_swarming_builders": true |
963 }, | 976 }, |
| 977 "test": "sync_unit_tests" |
| 978 }, |
| 979 { |
| 980 "swarming": { |
| 981 "can_use_on_swarming_builders": true |
| 982 }, |
964 "test": "ui_base_unittests" | 983 "test": "ui_base_unittests" |
965 }, | 984 }, |
966 { | 985 { |
967 "swarming": { | 986 "swarming": { |
968 "can_use_on_swarming_builders": true | 987 "can_use_on_swarming_builders": true |
969 }, | 988 }, |
970 "test": "unit_tests" | 989 "test": "unit_tests" |
971 }, | 990 }, |
972 { | 991 { |
973 "swarming": { | 992 "swarming": { |
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1276 { | 1295 { |
1277 "swarming": { | 1296 "swarming": { |
1278 "can_use_on_swarming_builders": true | 1297 "can_use_on_swarming_builders": true |
1279 }, | 1298 }, |
1280 "test": "sync_integration_tests" | 1299 "test": "sync_integration_tests" |
1281 }, | 1300 }, |
1282 { | 1301 { |
1283 "swarming": { | 1302 "swarming": { |
1284 "can_use_on_swarming_builders": true | 1303 "can_use_on_swarming_builders": true |
1285 }, | 1304 }, |
| 1305 "test": "sync_unit_tests" |
| 1306 }, |
| 1307 { |
| 1308 "swarming": { |
| 1309 "can_use_on_swarming_builders": true |
| 1310 }, |
1286 "test": "ui_base_unittests" | 1311 "test": "ui_base_unittests" |
1287 }, | 1312 }, |
1288 { | 1313 { |
1289 "swarming": { | 1314 "swarming": { |
1290 "can_use_on_swarming_builders": true | 1315 "can_use_on_swarming_builders": true |
1291 }, | 1316 }, |
1292 "test": "unit_tests" | 1317 "test": "unit_tests" |
1293 }, | 1318 }, |
1294 { | 1319 { |
1295 "swarming": { | 1320 "swarming": { |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1327 } | 1352 } |
1328 ], | 1353 ], |
1329 "scripts": [ | 1354 "scripts": [ |
1330 { | 1355 { |
1331 "name": "nacl_integration", | 1356 "name": "nacl_integration", |
1332 "script": "nacl_integration.py" | 1357 "script": "nacl_integration.py" |
1333 } | 1358 } |
1334 ] | 1359 ] |
1335 } | 1360 } |
1336 } | 1361 } |
OLD | NEW |