| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # Contains the bulk of the V8 builder configurations so they can be reused | 5 # Contains the bulk of the V8 builder configurations so they can be reused |
| 6 # from multiple recipes. | 6 # from multiple recipes. |
| 7 | 7 |
| 8 from recipe_engine.types import freeze | 8 from recipe_engine.types import freeze |
| 9 from testing import V8NoExhaustiveVariants, V8Variant, V8VariantNeutral | 9 from testing import V8NoExhaustiveVariants, V8Variant, V8VariantNeutral |
| 10 | 10 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 | 66 |
| 67 | 67 |
| 68 def with_test_args(suffix, test_args, tests, variants=V8VariantNeutral): | 68 def with_test_args(suffix, test_args, tests, variants=V8VariantNeutral): |
| 69 """Wrapper that runs a list of tests with additional arguments.""" | 69 """Wrapper that runs a list of tests with additional arguments.""" |
| 70 return [ | 70 return [ |
| 71 TestStepConfig(t.name, t.shards, t.swarming, suffix, test_args, variants) | 71 TestStepConfig(t.name, t.shards, t.swarming, suffix, test_args, variants) |
| 72 for t in tests | 72 for t in tests |
| 73 ] | 73 ] |
| 74 | 74 |
| 75 | 75 |
| 76 SWARMING_FYI_PROPS = { |
| 77 'default_expiration': 2 * 60 * 60, |
| 78 'default_hard_timeout': 60 * 60, |
| 79 'default_priority': 35, |
| 80 } |
| 81 |
| 76 BUILDERS = { | 82 BUILDERS = { |
| 77 ####### Waterfall: client.v8 | 83 ####### Waterfall: client.v8 |
| 78 'client.v8': { | 84 'client.v8': { |
| 79 'builders': { | 85 'builders': { |
| 80 ####### Category: Linux | 86 ####### Category: Linux |
| 81 'V8 Linux - builder': { | 87 'V8 Linux - builder': { |
| 82 'chromium_apply_config': [ | 88 'chromium_apply_config': [ |
| 83 'default_compiler', 'v8_ninja', 'goma', 'gcmole', 'mb'], | 89 'default_compiler', 'v8_ninja', 'goma', 'gcmole', 'mb'], |
| 84 'v8_config_kwargs': { | 90 'v8_config_kwargs': { |
| 85 'BUILD_CONFIG': 'Release', | 91 'BUILD_CONFIG': 'Release', |
| (...skipping 1437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1523 }, | 1529 }, |
| 1524 'V8 Linux - mipsel - sim - builder': { | 1530 'V8 Linux - mipsel - sim - builder': { |
| 1525 'chromium_apply_config': [ | 1531 'chromium_apply_config': [ |
| 1526 'default_compiler', 'v8_ninja', 'goma', 'simulate_mipsel', 'mb'], | 1532 'default_compiler', 'v8_ninja', 'goma', 'simulate_mipsel', 'mb'], |
| 1527 'v8_config_kwargs': { | 1533 'v8_config_kwargs': { |
| 1528 'BUILD_CONFIG': 'Release', | 1534 'BUILD_CONFIG': 'Release', |
| 1529 'TARGET_BITS': 32, | 1535 'TARGET_BITS': 32, |
| 1530 }, | 1536 }, |
| 1531 'bot_type': 'builder', | 1537 'bot_type': 'builder', |
| 1532 'build_gs_archive': 'mipsel_sim_rel_archive', | 1538 'build_gs_archive': 'mipsel_sim_rel_archive', |
| 1539 'enable_swarming': True, |
| 1533 'testing': {'platform': 'linux'}, | 1540 'testing': {'platform': 'linux'}, |
| 1534 'triggers': [ | 1541 'triggers': [ |
| 1535 'V8 Linux - mipsel - sim', | 1542 'V8 Linux - mipsel - sim', |
| 1536 ], | 1543 ], |
| 1537 }, | 1544 }, |
| 1538 'V8 Linux - mips64el - sim - builder': { | 1545 'V8 Linux - mips64el - sim - builder': { |
| 1539 'chromium_apply_config': [ | 1546 'chromium_apply_config': [ |
| 1540 'default_compiler', 'v8_ninja', 'goma', 'simulate_mipsel', 'mb'], | 1547 'default_compiler', 'v8_ninja', 'goma', 'simulate_mipsel', 'mb'], |
| 1541 'v8_config_kwargs': { | 1548 'v8_config_kwargs': { |
| 1542 'BUILD_CONFIG': 'Release', | 1549 'BUILD_CONFIG': 'Release', |
| 1543 'TARGET_BITS': 64, | 1550 'TARGET_BITS': 64, |
| 1544 }, | 1551 }, |
| 1545 'bot_type': 'builder', | 1552 'bot_type': 'builder', |
| 1546 'build_gs_archive': 'mips64el_sim_rel_archive', | 1553 'build_gs_archive': 'mips64el_sim_rel_archive', |
| 1547 'testing': {'platform': 'linux'}, | 1554 'testing': {'platform': 'linux'}, |
| 1548 }, | 1555 }, |
| 1549 'V8 Linux - mipsel - sim': { | 1556 'V8 Linux - mipsel - sim': { |
| 1550 'chromium_apply_config': ['simulate_mipsel'], | 1557 'chromium_apply_config': ['simulate_mipsel'], |
| 1551 'v8_config_kwargs': { | 1558 'v8_config_kwargs': { |
| 1552 'BUILD_CONFIG': 'Release', | 1559 'BUILD_CONFIG': 'Release', |
| 1553 'TARGET_BITS': 32, | 1560 'TARGET_BITS': 32, |
| 1554 }, | 1561 }, |
| 1555 'bot_type': 'tester', | 1562 'bot_type': 'tester', |
| 1556 'parent_buildername': 'V8 Linux - mipsel - sim - builder', | 1563 'parent_buildername': 'V8 Linux - mipsel - sim - builder', |
| 1557 'build_gs_archive': 'mipsel_sim_rel_archive', | 1564 'build_gs_archive': 'mipsel_sim_rel_archive', |
| 1558 'tests': [V8Testing, Test262, SimdJs], | 1565 'enable_swarming': True, |
| 1566 'tests': [V8Testing_2, Test262, SimdJs], |
| 1559 'testing': {'platform': 'linux'}, | 1567 'testing': {'platform': 'linux'}, |
| 1568 'swarming_dimensions': { |
| 1569 'os': 'Ubuntu-14.04', |
| 1570 }, |
| 1560 }, | 1571 }, |
| 1561 ####### Category: PPC | 1572 ####### Category: PPC |
| 1562 'V8 Linux - ppc - sim': { | 1573 'V8 Linux - ppc - sim': { |
| 1563 'chromium_apply_config': [ | 1574 'chromium_apply_config': [ |
| 1564 'default_compiler', 'v8_ninja', 'goma', 'simulate_ppc', 'mb'], | 1575 'default_compiler', 'v8_ninja', 'goma', 'simulate_ppc', 'mb'], |
| 1565 'v8_config_kwargs': { | 1576 'v8_config_kwargs': { |
| 1566 'BUILD_CONFIG': 'Release', | 1577 'BUILD_CONFIG': 'Release', |
| 1567 'TARGET_BITS': 32, | 1578 'TARGET_BITS': 32, |
| 1568 }, | 1579 }, |
| 1569 'bot_type': 'builder_tester', | 1580 'bot_type': 'builder_tester', |
| 1570 'tests': [V8Testing], | 1581 'enable_swarming': True, |
| 1582 'tests': [V8Testing_2], |
| 1571 'testing': {'platform': 'linux'}, | 1583 'testing': {'platform': 'linux'}, |
| 1584 'swarming_dimensions': { |
| 1585 'os': 'Ubuntu-14.04', |
| 1586 }, |
| 1587 'swarming_properties': SWARMING_FYI_PROPS, |
| 1572 }, | 1588 }, |
| 1573 'V8 Linux - ppc64 - sim': { | 1589 'V8 Linux - ppc64 - sim': { |
| 1574 'chromium_apply_config': [ | 1590 'chromium_apply_config': [ |
| 1575 'default_compiler', 'v8_ninja', 'goma', 'simulate_ppc', 'mb'], | 1591 'default_compiler', 'v8_ninja', 'goma', 'simulate_ppc', 'mb'], |
| 1576 'v8_config_kwargs': { | 1592 'v8_config_kwargs': { |
| 1577 'BUILD_CONFIG': 'Release', | 1593 'BUILD_CONFIG': 'Release', |
| 1578 'TARGET_BITS': 64, | 1594 'TARGET_BITS': 64, |
| 1579 }, | 1595 }, |
| 1580 'bot_type': 'builder_tester', | 1596 'bot_type': 'builder_tester', |
| 1581 'tests': [V8Testing], | 1597 'enable_swarming': True, |
| 1598 'tests': [V8Testing_2], |
| 1582 'testing': {'platform': 'linux'}, | 1599 'testing': {'platform': 'linux'}, |
| 1600 'swarming_dimensions': { |
| 1601 'os': 'Ubuntu-14.04', |
| 1602 }, |
| 1603 'swarming_properties': SWARMING_FYI_PROPS, |
| 1583 }, | 1604 }, |
| 1584 ####### Category: S390 | 1605 ####### Category: S390 |
| 1585 'V8 Linux - s390 - sim': { | 1606 'V8 Linux - s390 - sim': { |
| 1586 'chromium_apply_config': [ | 1607 'chromium_apply_config': [ |
| 1587 'default_compiler', 'v8_ninja', 'goma', 'simulate_s390', 'mb'], | 1608 'default_compiler', 'v8_ninja', 'goma', 'simulate_s390', 'mb'], |
| 1588 'v8_config_kwargs': { | 1609 'v8_config_kwargs': { |
| 1589 'BUILD_CONFIG': 'Release', | 1610 'BUILD_CONFIG': 'Release', |
| 1590 'TARGET_BITS': 32, | 1611 'TARGET_BITS': 32, |
| 1591 }, | 1612 }, |
| 1592 'bot_type': 'builder_tester', | 1613 'bot_type': 'builder_tester', |
| 1593 'tests': [V8Testing], | 1614 'enable_swarming': True, |
| 1615 'tests': [V8Testing_2], |
| 1594 'testing': {'platform': 'linux'}, | 1616 'testing': {'platform': 'linux'}, |
| 1617 'swarming_dimensions': { |
| 1618 'os': 'Ubuntu-14.04', |
| 1619 }, |
| 1620 'swarming_properties': SWARMING_FYI_PROPS, |
| 1595 }, | 1621 }, |
| 1596 'V8 Linux - s390x - sim': { | 1622 'V8 Linux - s390x - sim': { |
| 1597 'chromium_apply_config': [ | 1623 'chromium_apply_config': [ |
| 1598 'default_compiler', 'v8_ninja', 'goma', 'simulate_s390', 'mb'], | 1624 'default_compiler', 'v8_ninja', 'goma', 'simulate_s390', 'mb'], |
| 1599 'v8_config_kwargs': { | 1625 'v8_config_kwargs': { |
| 1600 'BUILD_CONFIG': 'Release', | 1626 'BUILD_CONFIG': 'Release', |
| 1601 'TARGET_BITS': 64, | 1627 'TARGET_BITS': 64, |
| 1602 }, | 1628 }, |
| 1603 'bot_type': 'builder_tester', | 1629 'bot_type': 'builder_tester', |
| 1604 'tests': [V8Testing], | 1630 'enable_swarming': True, |
| 1631 'tests': [V8Testing_2], |
| 1605 'testing': {'platform': 'linux'}, | 1632 'testing': {'platform': 'linux'}, |
| 1633 'swarming_dimensions': { |
| 1634 'os': 'Ubuntu-14.04', |
| 1635 }, |
| 1636 'swarming_properties': SWARMING_FYI_PROPS, |
| 1606 }, | 1637 }, |
| 1607 ####### Category: X87 | 1638 ####### Category: X87 |
| 1608 'V8 Linux - x87 - nosnap - debug builder': { | 1639 'V8 Linux - x87 - nosnap - debug builder': { |
| 1609 'v8_apply_config': ['no_snapshot'], | 1640 'v8_apply_config': ['no_snapshot'], |
| 1610 'chromium_apply_config': [ | 1641 'chromium_apply_config': [ |
| 1611 'v8_ninja', 'default_compiler', 'goma', 'no_snapshot', 'x87', 'mb'], | 1642 'v8_ninja', 'default_compiler', 'goma', 'no_snapshot', 'x87', 'mb'], |
| 1612 'v8_config_kwargs': { | 1643 'v8_config_kwargs': { |
| 1613 'BUILD_CONFIG': 'Debug', | 1644 'BUILD_CONFIG': 'Debug', |
| 1614 'TARGET_BITS': 32, | 1645 'TARGET_BITS': 32, |
| 1615 }, | 1646 }, |
| (...skipping 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2776 win['chromium_apply_config'].extend(['msvs2013']) | 2807 win['chromium_apply_config'].extend(['msvs2013']) |
| 2777 | 2808 |
| 2778 BUILDERS = freeze(BUILDERS) | 2809 BUILDERS = freeze(BUILDERS) |
| 2779 BRANCH_BUILDERS = freeze(BRANCH_BUILDERS) | 2810 BRANCH_BUILDERS = freeze(BRANCH_BUILDERS) |
| 2780 | 2811 |
| 2781 def iter_builders(): | 2812 def iter_builders(): |
| 2782 for mastername, master_config in BUILDERS.iteritems(): | 2813 for mastername, master_config in BUILDERS.iteritems(): |
| 2783 builders = master_config['builders'] | 2814 builders = master_config['builders'] |
| 2784 for buildername, bot_config in builders.iteritems(): | 2815 for buildername, bot_config in builders.iteritems(): |
| 2785 yield mastername, builders, buildername, bot_config | 2816 yield mastername, builders, buildername, bot_config |
| OLD | NEW |