OLD | NEW |
---|---|
1 { | 1 { |
2 "Android GN": { | 2 "Android GN": { |
3 "additional_compile_targets": [ | 3 "additional_compile_targets": [ |
4 "blimp_tests", | 4 "blimp_tests", |
5 "chrome_public_apk", | 5 "chrome_public_apk", |
6 "chrome_public_test_apk", | 6 "chrome_public_test_apk", |
7 "content_shell_apk", | 7 "content_shell_apk", |
8 "mandoline:all" | 8 "mandoline:all" |
9 ], | 9 ], |
10 "gtest_tests": [ | 10 "gtest_tests": [ |
11 { | 11 { |
12 "test": "blimp_common_unit_tests" | |
13 }, | |
14 { | |
12 "test": "html_viewer_unittests" | 15 "test": "html_viewer_unittests" |
13 }, | 16 }, |
14 { | 17 { |
15 "test": "ipc_mojo_unittests" | 18 "test": "ipc_mojo_unittests" |
16 }, | 19 }, |
17 { | 20 { |
18 "swarming": { | 21 "swarming": { |
19 "can_use_on_swarming_builders": true | 22 "can_use_on_swarming_builders": true |
20 }, | 23 }, |
21 "test": "mojo_common_unittests" | 24 "test": "mojo_common_unittests" |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
262 "test": "aura_unittests" | 265 "test": "aura_unittests" |
263 }, | 266 }, |
264 { | 267 { |
265 "swarming": { | 268 "swarming": { |
266 "can_use_on_swarming_builders": true | 269 "can_use_on_swarming_builders": true |
267 }, | 270 }, |
268 "test": "base_unittests" | 271 "test": "base_unittests" |
269 }, | 272 }, |
270 { | 273 { |
271 "swarming": { | 274 "swarming": { |
275 "can_use_on_swarming_builders": true | |
276 }, | |
277 "test": "blimp_common_unit_tests" | |
Dirk Pranke
2015/10/01 00:50:48
don't add this entry, as per my earlier feedback.
Kevin M
2015/10/01 21:41:21
Done.
| |
278 }, | |
279 { | |
280 "swarming": { | |
272 "can_use_on_swarming_builders": true, | 281 "can_use_on_swarming_builders": true, |
273 "shards": 5 | 282 "shards": 5 |
274 }, | 283 }, |
275 "test": "browser_tests" | 284 "test": "browser_tests" |
276 }, | 285 }, |
277 { | 286 { |
278 "swarming": { | 287 "swarming": { |
279 "can_use_on_swarming_builders": true | 288 "can_use_on_swarming_builders": true |
280 }, | 289 }, |
281 "test": "cacheinvalidation_unittests" | 290 "test": "cacheinvalidation_unittests" |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
684 "test": "aura_unittests" | 693 "test": "aura_unittests" |
685 }, | 694 }, |
686 { | 695 { |
687 "swarming": { | 696 "swarming": { |
688 "can_use_on_swarming_builders": true | 697 "can_use_on_swarming_builders": true |
689 }, | 698 }, |
690 "test": "base_unittests" | 699 "test": "base_unittests" |
691 }, | 700 }, |
692 { | 701 { |
693 "swarming": { | 702 "swarming": { |
703 "can_use_on_swarming_builders": true | |
704 }, | |
705 "test": "blimp_common_unit_tests" | |
706 }, | |
707 { | |
708 "swarming": { | |
694 "can_use_on_swarming_builders": true, | 709 "can_use_on_swarming_builders": true, |
695 "shards": 5 | 710 "shards": 5 |
696 }, | 711 }, |
697 "test": "browser_tests" | 712 "test": "browser_tests" |
698 }, | 713 }, |
699 { | 714 { |
700 "swarming": { | 715 "swarming": { |
701 "can_use_on_swarming_builders": true | 716 "can_use_on_swarming_builders": true |
702 }, | 717 }, |
703 "test": "cacheinvalidation_unittests" | 718 "test": "cacheinvalidation_unittests" |
(...skipping 1011 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1715 } | 1730 } |
1716 ], | 1731 ], |
1717 "scripts": [ | 1732 "scripts": [ |
1718 { | 1733 { |
1719 "name": "nacl_integration", | 1734 "name": "nacl_integration", |
1720 "script": "nacl_integration.py" | 1735 "script": "nacl_integration.py" |
1721 } | 1736 } |
1722 ] | 1737 ] |
1723 } | 1738 } |
1724 } | 1739 } |
OLD | NEW |