| 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 2679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2690 BRANCH_BUILDERS = {} | 2690 BRANCH_BUILDERS = {} |
| 2691 | 2691 |
| 2692 def AddBranchBuilder(build_config, arch, bits, presubmit=False, | 2692 def AddBranchBuilder(build_config, arch, bits, presubmit=False, |
| 2693 unittests_only=False): | 2693 unittests_only=False): |
| 2694 if unittests_only: | 2694 if unittests_only: |
| 2695 tests = [Unittests] | 2695 tests = [Unittests] |
| 2696 else: | 2696 else: |
| 2697 tests = [V8Testing, Test262, Mozilla] | 2697 tests = [V8Testing, Test262, Mozilla] |
| 2698 if presubmit: | 2698 if presubmit: |
| 2699 tests = [Presubmit] + tests | 2699 tests = [Presubmit] + tests |
| 2700 config = { | 2700 return { |
| 2701 'chromium_apply_config': ['default_compiler', 'v8_ninja', 'goma'], | 2701 'chromium_apply_config': ['default_compiler', 'v8_ninja', 'goma'], |
| 2702 'v8_config_kwargs': { | 2702 'v8_config_kwargs': { |
| 2703 'BUILD_CONFIG': build_config, | 2703 'BUILD_CONFIG': build_config, |
| 2704 'TARGET_ARCH': arch, | 2704 'TARGET_ARCH': arch, |
| 2705 'TARGET_BITS': bits, | 2705 'TARGET_BITS': bits, |
| 2706 }, | 2706 }, |
| 2707 'bot_type': 'builder_tester', | 2707 'bot_type': 'builder_tester', |
| 2708 'tests': tests, | 2708 'tests': tests, |
| 2709 'testing': {'platform': 'linux'}, | 2709 'testing': {'platform': 'linux'}, |
| 2710 } | 2710 } |
| 2711 if not unittests_only: | |
| 2712 config['gclient_apply_config'] = ['mozilla_tests'] | |
| 2713 return config | |
| 2714 | 2711 |
| 2715 for build_config, name_suffix in (('Release', ''), ('Debug', ' - debug')): | 2712 for build_config, name_suffix in (('Release', ''), ('Debug', ' - debug')): |
| 2716 for branch_name in ('stable branch', 'beta branch'): | 2713 for branch_name in ('stable branch', 'beta branch'): |
| 2717 name = 'V8 Linux - %s%s' % (branch_name, name_suffix) | 2714 name = 'V8 Linux - %s%s' % (branch_name, name_suffix) |
| 2718 BRANCH_BUILDERS[name] = AddBranchBuilder( | 2715 BRANCH_BUILDERS[name] = AddBranchBuilder( |
| 2719 build_config, 'intel', 32, presubmit=True) | 2716 build_config, 'intel', 32, presubmit=True) |
| 2720 name = 'V8 Linux64 - %s%s' % (branch_name, name_suffix) | 2717 name = 'V8 Linux64 - %s%s' % (branch_name, name_suffix) |
| 2721 BRANCH_BUILDERS[name] = AddBranchBuilder(build_config, 'intel', 64) | 2718 BRANCH_BUILDERS[name] = AddBranchBuilder(build_config, 'intel', 64) |
| 2722 name = 'V8 arm - sim - %s%s' % (branch_name, name_suffix) | 2719 name = 'V8 arm - sim - %s%s' % (branch_name, name_suffix) |
| 2723 BRANCH_BUILDERS[name] = AddBranchBuilder(build_config, 'intel', 32) | 2720 BRANCH_BUILDERS[name] = AddBranchBuilder(build_config, 'intel', 32) |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2775 win['chromium_apply_config'].extend(['msvs2013']) | 2772 win['chromium_apply_config'].extend(['msvs2013']) |
| 2776 | 2773 |
| 2777 BUILDERS = freeze(BUILDERS) | 2774 BUILDERS = freeze(BUILDERS) |
| 2778 BRANCH_BUILDERS = freeze(BRANCH_BUILDERS) | 2775 BRANCH_BUILDERS = freeze(BRANCH_BUILDERS) |
| 2779 | 2776 |
| 2780 def iter_builders(): | 2777 def iter_builders(): |
| 2781 for mastername, master_config in BUILDERS.iteritems(): | 2778 for mastername, master_config in BUILDERS.iteritems(): |
| 2782 builders = master_config['builders'] | 2779 builders = master_config['builders'] |
| 2783 for buildername, bot_config in builders.iteritems(): | 2780 for buildername, bot_config in builders.iteritems(): |
| 2784 yield mastername, builders, buildername, bot_config | 2781 yield mastername, builders, buildername, bot_config |
| OLD | NEW |