| OLD | NEW |
| 1 { | 1 { |
| 2 "Jelly Bean Tester": { | 2 "Jelly Bean Tester": { |
| 3 "gtest_tests": [ | 3 "gtest_tests": [ |
| 4 { | 4 { |
| 5 "test": "android_webview_unittests" | 5 "test": "android_webview_unittests" |
| 6 }, | 6 }, |
| 7 { | 7 { |
| 8 "test": "base_unittests" | 8 "test": "base_unittests" |
| 9 }, | 9 }, |
| 10 { | 10 { |
| 11 "test": "blimp_unittests" | |
| 12 }, | |
| 13 { | |
| 14 "override_compile_targets": [ | 11 "override_compile_targets": [ |
| 15 "breakpad_unittests_deps" | 12 "breakpad_unittests_deps" |
| 16 ], | 13 ], |
| 17 "test": "breakpad_unittests" | 14 "test": "breakpad_unittests" |
| 18 }, | 15 }, |
| 19 { | 16 { |
| 20 "test": "capture_unittests" | 17 "test": "capture_unittests" |
| 21 }, | 18 }, |
| 22 { | 19 { |
| 23 "test": "cc_unittests" | 20 "test": "cc_unittests" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 }, | 81 }, |
| 85 { | 82 { |
| 86 "test": "ui_touch_selection_unittests" | 83 "test": "ui_touch_selection_unittests" |
| 87 }, | 84 }, |
| 88 { | 85 { |
| 89 "test": "unit_tests" | 86 "test": "unit_tests" |
| 90 } | 87 } |
| 91 ], | 88 ], |
| 92 "instrumentation_tests": [ | 89 "instrumentation_tests": [ |
| 93 { | 90 { |
| 94 "apk_under_test": "Blimp.apk", | |
| 95 "override_compile_targets": [ | |
| 96 "blimp_test_apk" | |
| 97 ], | |
| 98 "test": "blimp_test_apk", | |
| 99 "test_apk": "BlimpTest.apk" | |
| 100 }, | |
| 101 { | |
| 102 "test": "chrome_public_test_apk" | 91 "test": "chrome_public_test_apk" |
| 103 }, | 92 }, |
| 104 { | 93 { |
| 105 "test": "chrome_sync_shell_test_apk" | 94 "test": "chrome_sync_shell_test_apk" |
| 106 }, | 95 }, |
| 107 { | 96 { |
| 108 "test": "content_shell_test_apk" | 97 "test": "content_shell_test_apk" |
| 109 } | 98 } |
| 110 ] | 99 ] |
| 111 }, | 100 }, |
| 112 "Lollipop Consumer Tester": { | 101 "Lollipop Consumer Tester": { |
| 113 "gtest_tests": [ | 102 "gtest_tests": [ |
| 114 { | 103 { |
| 115 "test": "android_webview_unittests" | 104 "test": "android_webview_unittests" |
| 116 }, | 105 }, |
| 117 { | 106 { |
| 118 "test": "base_unittests" | 107 "test": "base_unittests" |
| 119 }, | 108 }, |
| 120 { | 109 { |
| 121 "test": "blimp_unittests" | |
| 122 }, | |
| 123 { | |
| 124 "override_compile_targets": [ | 110 "override_compile_targets": [ |
| 125 "breakpad_unittests_deps" | 111 "breakpad_unittests_deps" |
| 126 ], | 112 ], |
| 127 "test": "breakpad_unittests" | 113 "test": "breakpad_unittests" |
| 128 }, | 114 }, |
| 129 { | 115 { |
| 130 "test": "capture_unittests" | 116 "test": "capture_unittests" |
| 131 }, | 117 }, |
| 132 { | 118 { |
| 133 "test": "cc_unittests" | 119 "test": "cc_unittests" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 }, | 183 }, |
| 198 { | 184 { |
| 199 "test": "unit_tests" | 185 "test": "unit_tests" |
| 200 } | 186 } |
| 201 ], | 187 ], |
| 202 "instrumentation_tests": [ | 188 "instrumentation_tests": [ |
| 203 { | 189 { |
| 204 "test": "android_webview_test_apk" | 190 "test": "android_webview_test_apk" |
| 205 }, | 191 }, |
| 206 { | 192 { |
| 207 "apk_under_test": "Blimp.apk", | |
| 208 "override_compile_targets": [ | |
| 209 "blimp_test_apk" | |
| 210 ], | |
| 211 "test": "blimp_test_apk", | |
| 212 "test_apk": "BlimpTest.apk" | |
| 213 }, | |
| 214 { | |
| 215 "test": "chrome_public_test_apk" | 193 "test": "chrome_public_test_apk" |
| 216 }, | 194 }, |
| 217 { | 195 { |
| 218 "test": "chrome_sync_shell_test_apk" | 196 "test": "chrome_sync_shell_test_apk" |
| 219 }, | 197 }, |
| 220 { | 198 { |
| 221 "test": "content_shell_test_apk" | 199 "test": "content_shell_test_apk" |
| 222 } | 200 } |
| 223 ] | 201 ] |
| 224 }, | 202 }, |
| 225 "Lollipop Low-end Tester": { | 203 "Lollipop Low-end Tester": { |
| 226 "gtest_tests": [ | 204 "gtest_tests": [ |
| 227 { | 205 { |
| 228 "test": "android_webview_unittests" | 206 "test": "android_webview_unittests" |
| 229 }, | 207 }, |
| 230 { | 208 { |
| 231 "test": "base_unittests" | 209 "test": "base_unittests" |
| 232 }, | 210 }, |
| 233 { | 211 { |
| 234 "test": "blimp_unittests" | |
| 235 }, | |
| 236 { | |
| 237 "override_compile_targets": [ | 212 "override_compile_targets": [ |
| 238 "breakpad_unittests_deps" | 213 "breakpad_unittests_deps" |
| 239 ], | 214 ], |
| 240 "test": "breakpad_unittests" | 215 "test": "breakpad_unittests" |
| 241 }, | 216 }, |
| 242 { | 217 { |
| 243 "test": "capture_unittests" | 218 "test": "capture_unittests" |
| 244 }, | 219 }, |
| 245 { | 220 { |
| 246 "test": "cc_unittests" | 221 "test": "cc_unittests" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 { | 294 { |
| 320 "test": "unit_tests" | 295 "test": "unit_tests" |
| 321 } | 296 } |
| 322 ], | 297 ], |
| 323 "instrumentation_tests": [ | 298 "instrumentation_tests": [ |
| 324 { | 299 { |
| 325 "test": "android_webview_test_apk", | 300 "test": "android_webview_test_apk", |
| 326 "timeout_scale": 4 | 301 "timeout_scale": 4 |
| 327 }, | 302 }, |
| 328 { | 303 { |
| 329 "override_compile_targets": [ | |
| 330 "blimp_test_apk" | |
| 331 ], | |
| 332 "test": "blimp_test_apk", | |
| 333 "timeout_scale": 4 | |
| 334 }, | |
| 335 { | |
| 336 "test": "chrome_public_test_apk", | 304 "test": "chrome_public_test_apk", |
| 337 "timeout_scale": 4 | 305 "timeout_scale": 4 |
| 338 }, | 306 }, |
| 339 { | 307 { |
| 340 "test": "chrome_sync_shell_test_apk", | 308 "test": "chrome_sync_shell_test_apk", |
| 341 "timeout_scale": 4 | 309 "timeout_scale": 4 |
| 342 }, | 310 }, |
| 343 { | 311 { |
| 344 "test": "content_shell_test_apk", | 312 "test": "content_shell_test_apk", |
| 345 "timeout_scale": 4 | 313 "timeout_scale": 4 |
| (...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1399 }, | 1367 }, |
| 1400 "test": "android_webview_unittests" | 1368 "test": "android_webview_unittests" |
| 1401 }, | 1369 }, |
| 1402 { | 1370 { |
| 1403 "swarming": { | 1371 "swarming": { |
| 1404 "can_use_on_swarming_builders": false | 1372 "can_use_on_swarming_builders": false |
| 1405 }, | 1373 }, |
| 1406 "test": "base_unittests" | 1374 "test": "base_unittests" |
| 1407 }, | 1375 }, |
| 1408 { | 1376 { |
| 1409 "swarming": { | |
| 1410 "can_use_on_swarming_builders": false | |
| 1411 }, | |
| 1412 "test": "blimp_unittests" | |
| 1413 }, | |
| 1414 { | |
| 1415 "override_compile_targets": [ | 1377 "override_compile_targets": [ |
| 1416 "breakpad_unittests_deps" | 1378 "breakpad_unittests_deps" |
| 1417 ], | 1379 ], |
| 1418 "swarming": { | 1380 "swarming": { |
| 1419 "can_use_on_swarming_builders": false | 1381 "can_use_on_swarming_builders": false |
| 1420 }, | 1382 }, |
| 1421 "test": "breakpad_unittests" | 1383 "test": "breakpad_unittests" |
| 1422 }, | 1384 }, |
| 1423 { | 1385 { |
| 1424 "swarming": { | 1386 "swarming": { |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1568 "can_use_on_swarming_builders": false | 1530 "can_use_on_swarming_builders": false |
| 1569 }, | 1531 }, |
| 1570 "test": "unit_tests" | 1532 "test": "unit_tests" |
| 1571 } | 1533 } |
| 1572 ], | 1534 ], |
| 1573 "instrumentation_tests": [ | 1535 "instrumentation_tests": [ |
| 1574 { | 1536 { |
| 1575 "test": "android_webview_test_apk" | 1537 "test": "android_webview_test_apk" |
| 1576 }, | 1538 }, |
| 1577 { | 1539 { |
| 1578 "override_compile_targets": [ | |
| 1579 "blimp_test_apk" | |
| 1580 ], | |
| 1581 "test": "blimp_test_apk" | |
| 1582 }, | |
| 1583 { | |
| 1584 "test": "chrome_public_test_apk" | 1540 "test": "chrome_public_test_apk" |
| 1585 }, | 1541 }, |
| 1586 { | 1542 { |
| 1587 "test": "chrome_sync_shell_test_apk" | 1543 "test": "chrome_sync_shell_test_apk" |
| 1588 }, | 1544 }, |
| 1589 { | 1545 { |
| 1590 "test": "content_shell_test_apk" | 1546 "test": "content_shell_test_apk" |
| 1591 } | 1547 } |
| 1592 ], | 1548 ], |
| 1593 "scripts": [ | 1549 "scripts": [ |
| (...skipping 11 matching lines...) Expand all Loading... |
| 1605 }, | 1561 }, |
| 1606 "test": "android_webview_unittests" | 1562 "test": "android_webview_unittests" |
| 1607 }, | 1563 }, |
| 1608 { | 1564 { |
| 1609 "swarming": { | 1565 "swarming": { |
| 1610 "can_use_on_swarming_builders": false | 1566 "can_use_on_swarming_builders": false |
| 1611 }, | 1567 }, |
| 1612 "test": "base_unittests" | 1568 "test": "base_unittests" |
| 1613 }, | 1569 }, |
| 1614 { | 1570 { |
| 1615 "swarming": { | |
| 1616 "can_use_on_swarming_builders": false | |
| 1617 }, | |
| 1618 "test": "blimp_unittests" | |
| 1619 }, | |
| 1620 { | |
| 1621 "override_compile_targets": [ | 1571 "override_compile_targets": [ |
| 1622 "breakpad_unittests_deps" | 1572 "breakpad_unittests_deps" |
| 1623 ], | 1573 ], |
| 1624 "swarming": { | 1574 "swarming": { |
| 1625 "can_use_on_swarming_builders": false | 1575 "can_use_on_swarming_builders": false |
| 1626 }, | 1576 }, |
| 1627 "test": "breakpad_unittests" | 1577 "test": "breakpad_unittests" |
| 1628 }, | 1578 }, |
| 1629 { | 1579 { |
| 1630 "swarming": { | 1580 "swarming": { |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1774 "can_use_on_swarming_builders": false | 1724 "can_use_on_swarming_builders": false |
| 1775 }, | 1725 }, |
| 1776 "test": "unit_tests" | 1726 "test": "unit_tests" |
| 1777 } | 1727 } |
| 1778 ], | 1728 ], |
| 1779 "instrumentation_tests": [ | 1729 "instrumentation_tests": [ |
| 1780 { | 1730 { |
| 1781 "test": "android_webview_test_apk" | 1731 "test": "android_webview_test_apk" |
| 1782 }, | 1732 }, |
| 1783 { | 1733 { |
| 1784 "override_compile_targets": [ | |
| 1785 "blimp_test_apk" | |
| 1786 ], | |
| 1787 "test": "blimp_test_apk" | |
| 1788 }, | |
| 1789 { | |
| 1790 "test": "chrome_public_test_apk" | 1734 "test": "chrome_public_test_apk" |
| 1791 }, | 1735 }, |
| 1792 { | 1736 { |
| 1793 "test": "chrome_sync_shell_test_apk" | 1737 "test": "chrome_sync_shell_test_apk" |
| 1794 }, | 1738 }, |
| 1795 { | 1739 { |
| 1796 "test": "content_shell_test_apk" | 1740 "test": "content_shell_test_apk" |
| 1797 } | 1741 } |
| 1798 ], | 1742 ], |
| 1799 "scripts": [ | 1743 "scripts": [ |
| 1800 { | 1744 { |
| 1801 "name": "telemetry_perf_unittests", | 1745 "name": "telemetry_perf_unittests", |
| 1802 "script": "telemetry_perf_unittests.py" | 1746 "script": "telemetry_perf_unittests.py" |
| 1803 } | 1747 } |
| 1804 ] | 1748 ] |
| 1805 } | 1749 } |
| 1806 } | 1750 } |
| OLD | NEW |