| 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 2654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2665 'bot_type': 'builder_tester', | 2665 'bot_type': 'builder_tester', |
| 2666 'testing': {'platform': 'linux'}, | 2666 'testing': {'platform': 'linux'}, |
| 2667 }, | 2667 }, |
| 2668 }, | 2668 }, |
| 2669 }, | 2669 }, |
| 2670 ####### Waterfall: client.dynamorio | 2670 ####### Waterfall: client.dynamorio |
| 2671 'client.dynamorio': { | 2671 'client.dynamorio': { |
| 2672 'builders': { | 2672 'builders': { |
| 2673 'linux-v8-dr': { | 2673 'linux-v8-dr': { |
| 2674 'gclient_apply_config': ['dynamorio'], | 2674 'gclient_apply_config': ['dynamorio'], |
| 2675 'chromium_apply_config': ['default_compiler', 'v8_ninja', 'goma'], | 2675 'chromium_apply_config': [ |
| 2676 'default_compiler', 'v8_ninja', 'goma', 'mb'], |
| 2676 'v8_config_kwargs': { | 2677 'v8_config_kwargs': { |
| 2677 'BUILD_CONFIG': 'Release', | 2678 'BUILD_CONFIG': 'Release', |
| 2678 'TARGET_BITS': 64, | 2679 'TARGET_BITS': 64, |
| 2679 }, | 2680 }, |
| 2680 'bot_type': 'builder_tester', | 2681 'bot_type': 'builder_tester', |
| 2681 'tests': [V8Testing], | 2682 'tests': [V8Testing], |
| 2682 'testing': {'platform': 'linux'}, | 2683 'testing': {'platform': 'linux'}, |
| 2683 }, | 2684 }, |
| 2684 }, | 2685 }, |
| 2685 }, | 2686 }, |
| 2686 } | 2687 } |
| 2687 | 2688 |
| 2688 ####### Waterfall: client.v8.branches | 2689 ####### Waterfall: client.v8.branches |
| 2689 BRANCH_BUILDERS = {} | 2690 BRANCH_BUILDERS = {} |
| 2690 | 2691 |
| 2691 def AddBranchBuilder(build_config, arch, bits, presubmit=False, | 2692 def AddBranchBuilder(build_config, arch, bits, presubmit=False, |
| 2692 unittests_only=False): | 2693 unittests_only=False): |
| 2693 if unittests_only: | 2694 if unittests_only: |
| 2694 tests = [Unittests] | 2695 tests = [Unittests] |
| 2695 else: | 2696 else: |
| 2696 tests = [V8Testing, Test262, Mozilla] | 2697 tests = [V8Testing, Test262, Mozilla] |
| 2697 if presubmit: | 2698 if presubmit: |
| 2698 tests = [Presubmit] + tests | 2699 tests = [Presubmit] + tests |
| 2699 return { | 2700 return { |
| 2700 'chromium_apply_config': ['default_compiler', 'v8_ninja', 'goma'], | 2701 'chromium_apply_config': ['default_compiler', 'v8_ninja', 'goma', 'mb'], |
| 2701 'v8_config_kwargs': { | 2702 'v8_config_kwargs': { |
| 2702 'BUILD_CONFIG': build_config, | 2703 'BUILD_CONFIG': build_config, |
| 2703 'TARGET_ARCH': arch, | 2704 'TARGET_ARCH': arch, |
| 2704 'TARGET_BITS': bits, | 2705 'TARGET_BITS': bits, |
| 2705 }, | 2706 }, |
| 2706 'bot_type': 'builder_tester', | 2707 'bot_type': 'builder_tester', |
| 2707 'tests': tests, | 2708 'tests': tests, |
| 2708 'testing': {'platform': 'linux'}, | 2709 'testing': {'platform': 'linux'}, |
| 2709 } | 2710 } |
| 2710 | 2711 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2748 name = 'V8 s390x - sim - %s' % branch_name | 2749 name = 'V8 s390x - sim - %s' % branch_name |
| 2749 BRANCH_BUILDERS[name] = AddBranchBuilder( | 2750 BRANCH_BUILDERS[name] = AddBranchBuilder( |
| 2750 'Release', 'intel', 64, unittests_only=True) | 2751 'Release', 'intel', 64, unittests_only=True) |
| 2751 BRANCH_BUILDERS[name]['chromium_apply_config'].append('simulate_s390') | 2752 BRANCH_BUILDERS[name]['chromium_apply_config'].append('simulate_s390') |
| 2752 | 2753 |
| 2753 BUILDERS['client.v8.branches'] = {'builders': BRANCH_BUILDERS} | 2754 BUILDERS['client.v8.branches'] = {'builders': BRANCH_BUILDERS} |
| 2754 | 2755 |
| 2755 BUILDERS['client.dart.fyi'] = {'builders': { | 2756 BUILDERS['client.dart.fyi'] = {'builders': { |
| 2756 'v8-%s-release' % platform: { | 2757 'v8-%s-release' % platform: { |
| 2757 'chromium_apply_config': [ | 2758 'chromium_apply_config': [ |
| 2758 'v8_ninja', 'default_compiler', 'goma', 'disassembler'], | 2759 'v8_ninja', 'default_compiler', 'goma', 'disassembler', 'mb'], |
| 2759 'v8_config_kwargs': { | 2760 'v8_config_kwargs': { |
| 2760 'BUILD_CONFIG': 'Release', | 2761 'BUILD_CONFIG': 'Release', |
| 2761 'TARGET_ARCH': 'intel', | 2762 'TARGET_ARCH': 'intel', |
| 2762 'TARGET_BITS': 32, | 2763 'TARGET_BITS': 32, |
| 2763 }, | 2764 }, |
| 2764 'bot_type': 'builder', | 2765 'bot_type': 'builder', |
| 2765 'build_gs_archive': 'v8_for_dart_archive', | 2766 'build_gs_archive': 'v8_for_dart_archive', |
| 2766 'testing': {'platform': platform}, | 2767 'testing': {'platform': platform}, |
| 2767 } for platform in ('win', 'linux', 'mac') | 2768 } for platform in ('win', 'linux', 'mac') |
| 2768 }} | 2769 }} |
| 2769 | 2770 |
| 2770 win = BUILDERS['client.dart.fyi']['builders']['v8-win-release'] | 2771 win = BUILDERS['client.dart.fyi']['builders']['v8-win-release'] |
| 2771 win['chromium_apply_config'].extend(['msvs2013']) | 2772 win['chromium_apply_config'].extend(['msvs2013']) |
| 2772 | 2773 |
| 2773 BUILDERS = freeze(BUILDERS) | 2774 BUILDERS = freeze(BUILDERS) |
| 2774 BRANCH_BUILDERS = freeze(BRANCH_BUILDERS) | 2775 BRANCH_BUILDERS = freeze(BRANCH_BUILDERS) |
| 2775 | 2776 |
| 2776 def iter_builders(): | 2777 def iter_builders(): |
| 2777 for mastername, master_config in BUILDERS.iteritems(): | 2778 for mastername, master_config in BUILDERS.iteritems(): |
| 2778 builders = master_config['builders'] | 2779 builders = master_config['builders'] |
| 2779 for buildername, bot_config in builders.iteritems(): | 2780 for buildername, bot_config in builders.iteritems(): |
| 2780 yield mastername, builders, buildername, bot_config | 2781 yield mastername, builders, buildername, bot_config |
| OLD | NEW |