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 import copy | 5 import copy |
6 | 6 |
7 from . import chromium_chromiumos | 7 from . import chromium_chromiumos |
8 from . import steps | 8 from . import steps |
9 | 9 |
10 SPEC = copy.deepcopy(chromium_chromiumos.SPEC) | 10 SPEC = copy.deepcopy(chromium_chromiumos.SPEC) |
11 for b in SPEC['builders'].itervalues(): | 11 for b in SPEC['builders'].itervalues(): |
12 b['gclient_apply_config'] = ['blink'] | 12 b['gclient_apply_config'] = ['blink'] |
13 | 13 |
14 SPEC['settings']['build_gs_bucket'] = 'chromium-webkit-archive' | 14 SPEC['settings']['build_gs_bucket'] = 'chromium-webkit-archive' |
15 SPEC['settings']['src_side_runtest_py'] = False | 15 SPEC['settings']['src_side_runtest_py'] = False |
16 | 16 |
17 SPEC['builders'].update({ | 17 SPEC['builders'].update({ |
18 'WebKit Win Builder': { | 18 'WebKit Win Builder': { |
19 'chromium_config': 'chromium', | 19 'chromium_config': 'chromium', |
20 'chromium_apply_config': ['mb'], | 20 'chromium_apply_config': ['mb'], |
21 'gclient_config': 'chromium', | 21 'gclient_config': 'chromium', |
22 'gclient_apply_config': ['blink_or_chromium'], | 22 'gclient_apply_config': ['blink_or_chromium'], |
23 'chromium_config_kwargs': { | 23 'chromium_config_kwargs': { |
24 'BUILD_CONFIG': 'Release', | 24 'BUILD_CONFIG': 'Release', |
25 'TARGET_BITS': 32, | 25 'TARGET_BITS': 32, |
26 }, | 26 }, |
| 27 'compile_targets': [ |
| 28 # TODO(phajdan.jr): Find a way to automatically add crash_service |
| 29 # to Windows builds (so that start_crash_service step works). |
| 30 'crash_service', |
| 31 ], |
27 'bot_type': 'builder', | 32 'bot_type': 'builder', |
28 'testing': { | 33 'testing': { |
29 'platform': 'win', | 34 'platform': 'win', |
30 }, | 35 }, |
31 'enable_swarming': True, | 36 'enable_swarming': True, |
32 'use_isolate': True, | 37 'use_isolate': True, |
33 }, | 38 }, |
34 'WebKit Win7': { | 39 'WebKit Win7': { |
35 'chromium_config': 'chromium', | 40 'chromium_config': 'chromium', |
36 'chromium_apply_config': ['mb'], | 41 'chromium_apply_config': ['mb'], |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 'chromium_apply_config': ['mb'], | 89 'chromium_apply_config': ['mb'], |
85 'gclient_config': 'chromium', | 90 'gclient_config': 'chromium', |
86 'gclient_apply_config': ['blink_or_chromium'], | 91 'gclient_apply_config': ['blink_or_chromium'], |
87 'chromium_config_kwargs': { | 92 'chromium_config_kwargs': { |
88 'BUILD_CONFIG': 'Release', | 93 'BUILD_CONFIG': 'Release', |
89 'TARGET_BITS': 64, | 94 'TARGET_BITS': 64, |
90 }, | 95 }, |
91 'compile_targets': [ | 96 'compile_targets': [ |
92 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers. | 97 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers. |
93 'blink_tests', | 98 'blink_tests', |
| 99 |
| 100 # TODO(phajdan.jr): Find a way to automatically add crash_service |
| 101 # to Windows builds (so that start_crash_service step works). |
| 102 'crash_service', |
94 ], | 103 ], |
95 'bot_type': 'builder_tester', | 104 'bot_type': 'builder_tester', |
96 'test_generators': [ | 105 'test_generators': [ |
97 steps.generate_gtest, | 106 steps.generate_gtest, |
98 steps.generate_script, | 107 steps.generate_script, |
99 ], | 108 ], |
100 'testing': { | 109 'testing': { |
101 'platform': 'win', | 110 'platform': 'win', |
102 }, | 111 }, |
103 'enable_swarming': True, | 112 'enable_swarming': True, |
104 'use_isolate': True, | 113 'use_isolate': True, |
105 }, | 114 }, |
106 'WebKit Win Builder (dbg)': { | 115 'WebKit Win Builder (dbg)': { |
107 'chromium_config': 'chromium', | 116 'chromium_config': 'chromium', |
108 'chromium_apply_config': ['mb'], | 117 'chromium_apply_config': ['mb'], |
109 'gclient_config': 'chromium', | 118 'gclient_config': 'chromium', |
110 'gclient_apply_config': ['blink_or_chromium'], | 119 'gclient_apply_config': ['blink_or_chromium'], |
111 'chromium_config_kwargs': { | 120 'chromium_config_kwargs': { |
112 'BUILD_CONFIG': 'Debug', | 121 'BUILD_CONFIG': 'Debug', |
113 'TARGET_BITS': 32, | 122 'TARGET_BITS': 32, |
114 }, | 123 }, |
| 124 'compile_targets': [ |
| 125 # TODO(phajdan.jr): Find a way to automatically add crash_service |
| 126 # to Windows builds (so that start_crash_service step works). |
| 127 'crash_service', |
| 128 ], |
115 'bot_type': 'builder', | 129 'bot_type': 'builder', |
116 'testing': { | 130 'testing': { |
117 'platform': 'win', | 131 'platform': 'win', |
118 }, | 132 }, |
119 'enable_swarming': True, | 133 'enable_swarming': True, |
120 'use_isolate': True, | 134 'use_isolate': True, |
121 }, | 135 }, |
122 'WebKit Win7 (dbg)': { | 136 'WebKit Win7 (dbg)': { |
123 'chromium_config': 'chromium', | 137 'chromium_config': 'chromium', |
124 'chromium_apply_config': ['mb'], | 138 'chromium_apply_config': ['mb'], |
(...skipping 23 matching lines...) Expand all Loading... |
148 'chromium_apply_config': ['mb'], | 162 'chromium_apply_config': ['mb'], |
149 'gclient_config': 'chromium', | 163 'gclient_config': 'chromium', |
150 'gclient_apply_config': ['blink_or_chromium'], | 164 'gclient_apply_config': ['blink_or_chromium'], |
151 'chromium_config_kwargs': { | 165 'chromium_config_kwargs': { |
152 'BUILD_CONFIG': 'Debug', | 166 'BUILD_CONFIG': 'Debug', |
153 'TARGET_BITS': 64, | 167 'TARGET_BITS': 64, |
154 }, | 168 }, |
155 'compile_targets': [ | 169 'compile_targets': [ |
156 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers. | 170 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers. |
157 'blink_tests', | 171 'blink_tests', |
| 172 |
| 173 # TODO(phajdan.jr): Find a way to automatically add crash_service |
| 174 # to Windows builds (so that start_crash_service step works). |
| 175 'crash_service', |
158 ], | 176 ], |
159 'bot_type': 'builder_tester', | 177 'bot_type': 'builder_tester', |
160 'test_generators': [ | 178 'test_generators': [ |
161 steps.generate_gtest, | 179 steps.generate_gtest, |
162 steps.generate_script, | 180 steps.generate_script, |
163 ], | 181 ], |
164 'testing': { | 182 'testing': { |
165 'platform': 'win', | 183 'platform': 'win', |
166 }, | 184 }, |
167 'enable_swarming': True, | 185 'enable_swarming': True, |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
542 '--options=--enable-leak-detection', | 560 '--options=--enable-leak-detection', |
543 ]), | 561 ]), |
544 ], | 562 ], |
545 'testing': { | 563 'testing': { |
546 'platform': 'linux', | 564 'platform': 'linux', |
547 }, | 565 }, |
548 'enable_swarming': True, | 566 'enable_swarming': True, |
549 'use_isolate': True, | 567 'use_isolate': True, |
550 }, | 568 }, |
551 }) | 569 }) |
OLD | NEW |