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 'gclient_config': 'chromium', | 21 'gclient_config': 'chromium', |
21 'gclient_apply_config': ['blink_or_chromium'], | 22 'gclient_apply_config': ['blink_or_chromium'], |
22 'chromium_config_kwargs': { | 23 'chromium_config_kwargs': { |
23 'BUILD_CONFIG': 'Release', | 24 'BUILD_CONFIG': 'Release', |
24 'TARGET_BITS': 32, | 25 'TARGET_BITS': 32, |
25 }, | 26 }, |
26 'compile_targets': [ | 27 'compile_targets': [ |
27 # TODO(phajdan.jr): Find a way to automatically add crash_service | 28 # TODO(phajdan.jr): Find a way to automatically add crash_service |
28 # to Windows builds (so that start_crash_service step works). | 29 # to Windows builds (so that start_crash_service step works). |
29 'crash_service', | 30 'crash_service', |
30 ], | 31 ], |
31 'bot_type': 'builder', | 32 'bot_type': 'builder', |
32 'testing': { | 33 'testing': { |
33 'platform': 'win', | 34 'platform': 'win', |
34 }, | 35 }, |
35 'enable_swarming': True, | 36 'enable_swarming': True, |
36 'use_isolate': True, | 37 'use_isolate': True, |
37 }, | 38 }, |
38 'WebKit XP': { | 39 'WebKit XP': { |
39 'chromium_config': 'chromium', | 40 'chromium_config': 'chromium', |
| 41 'chromium_apply_config': ['mb'], |
40 'gclient_config': 'chromium', | 42 'gclient_config': 'chromium', |
41 'gclient_apply_config': ['blink_or_chromium'], | 43 'gclient_apply_config': ['blink_or_chromium'], |
42 'chromium_config_kwargs': { | 44 'chromium_config_kwargs': { |
43 'BUILD_CONFIG': 'Release', | 45 'BUILD_CONFIG': 'Release', |
44 'TARGET_BITS': 32, | 46 'TARGET_BITS': 32, |
45 }, | 47 }, |
46 'bot_type': 'tester', | 48 'bot_type': 'tester', |
47 'parent_buildername': 'WebKit Win Builder', | 49 'parent_buildername': 'WebKit Win Builder', |
48 'test_generators': [ | 50 'test_generators': [ |
49 steps.generate_gtest, | 51 steps.generate_gtest, |
50 steps.generate_script, | 52 steps.generate_script, |
51 ], | 53 ], |
52 'tests': [ | 54 'tests': [ |
53 steps.BlinkTest(), | 55 steps.BlinkTest(), |
54 ], | 56 ], |
55 'testing': { | 57 'testing': { |
56 'platform': 'win', | 58 'platform': 'win', |
57 }, | 59 }, |
58 'enable_swarming': True, | 60 'enable_swarming': True, |
59 'use_isolate': True, | 61 'use_isolate': True, |
60 }, | 62 }, |
61 'WebKit Win7': { | 63 'WebKit Win7': { |
62 'chromium_config': 'chromium', | 64 'chromium_config': 'chromium', |
| 65 'chromium_apply_config': ['mb'], |
63 'gclient_config': 'chromium', | 66 'gclient_config': 'chromium', |
64 'gclient_apply_config': ['blink_or_chromium'], | 67 'gclient_apply_config': ['blink_or_chromium'], |
65 'chromium_config_kwargs': { | 68 'chromium_config_kwargs': { |
66 'BUILD_CONFIG': 'Release', | 69 'BUILD_CONFIG': 'Release', |
67 'TARGET_BITS': 32, | 70 'TARGET_BITS': 32, |
68 }, | 71 }, |
69 'bot_type': 'tester', | 72 'bot_type': 'tester', |
70 'parent_buildername': 'WebKit Win Builder', | 73 'parent_buildername': 'WebKit Win Builder', |
71 'test_generators': [ | 74 'test_generators': [ |
72 steps.generate_gtest, | 75 steps.generate_gtest, |
73 steps.generate_script, | 76 steps.generate_script, |
74 ], | 77 ], |
75 'tests': [ | 78 'tests': [ |
76 steps.BlinkTest(), | 79 steps.BlinkTest(), |
77 ], | 80 ], |
78 'testing': { | 81 'testing': { |
79 'platform': 'win', | 82 'platform': 'win', |
80 }, | 83 }, |
81 'enable_swarming': True, | 84 'enable_swarming': True, |
82 'use_isolate': True, | 85 'use_isolate': True, |
83 }, | 86 }, |
84 'WebKit Win10': { | 87 'WebKit Win10': { |
85 'chromium_config': 'chromium', | 88 'chromium_config': 'chromium', |
| 89 'chromium_apply_config': ['mb'], |
86 'gclient_config': 'chromium', | 90 'gclient_config': 'chromium', |
87 'gclient_apply_config': ['blink_or_chromium'], | 91 'gclient_apply_config': ['blink_or_chromium'], |
88 'chromium_config_kwargs': { | 92 'chromium_config_kwargs': { |
89 'BUILD_CONFIG': 'Release', | 93 'BUILD_CONFIG': 'Release', |
90 'TARGET_BITS': 32, | 94 'TARGET_BITS': 32, |
91 }, | 95 }, |
92 'bot_type': 'tester', | 96 'bot_type': 'tester', |
93 'parent_buildername': 'WebKit Win Builder', | 97 'parent_buildername': 'WebKit Win Builder', |
94 'test_generators': [ | 98 'test_generators': [ |
95 steps.generate_gtest, | 99 steps.generate_gtest, |
96 steps.generate_script, | 100 steps.generate_script, |
97 ], | 101 ], |
98 'tests': [ | 102 'tests': [ |
99 steps.BlinkTest(), | 103 steps.BlinkTest(), |
100 ], | 104 ], |
101 'testing': { | 105 'testing': { |
102 'platform': 'win', | 106 'platform': 'win', |
103 }, | 107 }, |
104 'enable_swarming': True, | 108 'enable_swarming': True, |
105 'use_isolate': True, | 109 'use_isolate': True, |
106 }, | 110 }, |
107 'WebKit Win x64 Builder': { | 111 'WebKit Win x64 Builder': { |
108 'chromium_config': 'chromium', | 112 'chromium_config': 'chromium', |
| 113 'chromium_apply_config': ['mb'], |
109 'gclient_config': 'chromium', | 114 'gclient_config': 'chromium', |
110 'chromium_apply_config': ['shared_library'], | |
111 'gclient_apply_config': ['blink_or_chromium'], | 115 'gclient_apply_config': ['blink_or_chromium'], |
112 'chromium_config_kwargs': { | 116 'chromium_config_kwargs': { |
113 'BUILD_CONFIG': 'Release', | 117 'BUILD_CONFIG': 'Release', |
114 'TARGET_BITS': 64, | 118 'TARGET_BITS': 64, |
115 }, | 119 }, |
116 'compile_targets': [ | 120 'compile_targets': [ |
117 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers. | 121 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers. |
118 'blink_tests', | 122 'blink_tests', |
119 | 123 |
120 # TODO(phajdan.jr): Find a way to automatically add crash_service | 124 # TODO(phajdan.jr): Find a way to automatically add crash_service |
121 # to Windows builds (so that start_crash_service step works). | 125 # to Windows builds (so that start_crash_service step works). |
122 'crash_service', | 126 'crash_service', |
123 ], | 127 ], |
124 'bot_type': 'builder_tester', | 128 'bot_type': 'builder_tester', |
125 'test_generators': [ | 129 'test_generators': [ |
126 steps.generate_gtest, | 130 steps.generate_gtest, |
127 steps.generate_script, | 131 steps.generate_script, |
128 ], | 132 ], |
129 'testing': { | 133 'testing': { |
130 'platform': 'win', | 134 'platform': 'win', |
131 }, | 135 }, |
132 'enable_swarming': True, | 136 'enable_swarming': True, |
133 'use_isolate': True, | 137 'use_isolate': True, |
134 }, | 138 }, |
135 'WebKit Win Builder (dbg)': { | 139 'WebKit Win Builder (dbg)': { |
136 'chromium_config': 'chromium', | 140 'chromium_config': 'chromium', |
| 141 'chromium_apply_config': ['mb'], |
137 'gclient_config': 'chromium', | 142 'gclient_config': 'chromium', |
138 'gclient_apply_config': ['blink_or_chromium'], | 143 'gclient_apply_config': ['blink_or_chromium'], |
139 'chromium_config_kwargs': { | 144 'chromium_config_kwargs': { |
140 'BUILD_CONFIG': 'Debug', | 145 'BUILD_CONFIG': 'Debug', |
141 'TARGET_BITS': 32, | 146 'TARGET_BITS': 32, |
142 }, | 147 }, |
143 'compile_targets': [ | 148 'compile_targets': [ |
144 # TODO(phajdan.jr): Find a way to automatically add crash_service | 149 # TODO(phajdan.jr): Find a way to automatically add crash_service |
145 # to Windows builds (so that start_crash_service step works). | 150 # to Windows builds (so that start_crash_service step works). |
146 'crash_service', | 151 'crash_service', |
147 ], | 152 ], |
148 'bot_type': 'builder', | 153 'bot_type': 'builder', |
149 'testing': { | 154 'testing': { |
150 'platform': 'win', | 155 'platform': 'win', |
151 }, | 156 }, |
152 'enable_swarming': True, | 157 'enable_swarming': True, |
153 'use_isolate': True, | 158 'use_isolate': True, |
154 }, | 159 }, |
155 'WebKit Win7 (dbg)': { | 160 'WebKit Win7 (dbg)': { |
156 'chromium_config': 'chromium', | 161 'chromium_config': 'chromium', |
| 162 'chromium_apply_config': ['mb'], |
157 'gclient_config': 'chromium', | 163 'gclient_config': 'chromium', |
158 'gclient_apply_config': ['blink_or_chromium'], | 164 'gclient_apply_config': ['blink_or_chromium'], |
159 'chromium_config_kwargs': { | 165 'chromium_config_kwargs': { |
160 'BUILD_CONFIG': 'Debug', | 166 'BUILD_CONFIG': 'Debug', |
161 'TARGET_BITS': 32, | 167 'TARGET_BITS': 32, |
162 }, | 168 }, |
163 'bot_type': 'tester', | 169 'bot_type': 'tester', |
164 'parent_buildername': 'WebKit Win Builder (dbg)', | 170 'parent_buildername': 'WebKit Win Builder (dbg)', |
165 'test_generators': [ | 171 'test_generators': [ |
166 steps.generate_gtest, | 172 steps.generate_gtest, |
167 steps.generate_script, | 173 steps.generate_script, |
168 ], | 174 ], |
169 'tests': [ | 175 'tests': [ |
170 steps.BlinkTest(), | 176 steps.BlinkTest(), |
171 ], | 177 ], |
172 'testing': { | 178 'testing': { |
173 'platform': 'win', | 179 'platform': 'win', |
174 }, | 180 }, |
175 'enable_swarming': True, | 181 'enable_swarming': True, |
176 'use_isolate': True, | 182 'use_isolate': True, |
177 }, | 183 }, |
178 'WebKit Win x64 Builder (dbg)': { | 184 'WebKit Win x64 Builder (dbg)': { |
179 'chromium_config': 'chromium', | 185 'chromium_config': 'chromium', |
| 186 'chromium_apply_config': ['mb'], |
180 'gclient_config': 'chromium', | 187 'gclient_config': 'chromium', |
181 'gclient_apply_config': ['blink_or_chromium'], | 188 'gclient_apply_config': ['blink_or_chromium'], |
182 'chromium_config_kwargs': { | 189 'chromium_config_kwargs': { |
183 'BUILD_CONFIG': 'Debug', | 190 'BUILD_CONFIG': 'Debug', |
184 'TARGET_BITS': 64, | 191 'TARGET_BITS': 64, |
185 }, | 192 }, |
186 'compile_targets': [ | 193 'compile_targets': [ |
187 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers. | 194 # TODO(phajdan.jr): Shouldn't be needed once we have 64-bit testers. |
188 'blink_tests', | 195 'blink_tests', |
189 | 196 |
190 # TODO(phajdan.jr): Find a way to automatically add crash_service | 197 # TODO(phajdan.jr): Find a way to automatically add crash_service |
191 # to Windows builds (so that start_crash_service step works). | 198 # to Windows builds (so that start_crash_service step works). |
192 'crash_service', | 199 'crash_service', |
193 ], | 200 ], |
194 'bot_type': 'builder_tester', | 201 'bot_type': 'builder_tester', |
195 'test_generators': [ | 202 'test_generators': [ |
196 steps.generate_gtest, | 203 steps.generate_gtest, |
197 steps.generate_script, | 204 steps.generate_script, |
198 ], | 205 ], |
199 'testing': { | 206 'testing': { |
200 'platform': 'win', | 207 'platform': 'win', |
201 }, | 208 }, |
202 'enable_swarming': True, | 209 'enable_swarming': True, |
203 'use_isolate': True, | 210 'use_isolate': True, |
204 }, | 211 }, |
205 'WebKit Mac Builder': { | 212 'WebKit Mac Builder': { |
206 'chromium_config': 'chromium', | 213 'chromium_config': 'chromium', |
| 214 'chromium_apply_config': ['mb'], |
207 'gclient_config': 'chromium', | 215 'gclient_config': 'chromium', |
208 'gclient_apply_config': ['blink_or_chromium'], | 216 'gclient_apply_config': ['blink_or_chromium'], |
209 'chromium_config_kwargs': { | 217 'chromium_config_kwargs': { |
210 'BUILD_CONFIG': 'Release', | 218 'BUILD_CONFIG': 'Release', |
211 'TARGET_BITS': 64, | 219 'TARGET_BITS': 64, |
212 }, | 220 }, |
213 'bot_type': 'builder', | 221 'bot_type': 'builder', |
214 'testing': { | 222 'testing': { |
215 'platform': 'mac', | 223 'platform': 'mac', |
216 }, | 224 }, |
217 'enable_swarming': True, | 225 'enable_swarming': True, |
218 'use_isolate': True, | 226 'use_isolate': True, |
219 }, | 227 }, |
220 'WebKit Mac10.6': { | 228 'WebKit Mac10.6': { |
221 'chromium_config': 'chromium', | 229 'chromium_config': 'chromium', |
| 230 'chromium_apply_config': ['mb'], |
222 'gclient_config': 'chromium', | 231 'gclient_config': 'chromium', |
223 'gclient_apply_config': ['blink_or_chromium'], | 232 'gclient_apply_config': ['blink_or_chromium'], |
224 'chromium_config_kwargs': { | 233 'chromium_config_kwargs': { |
225 'BUILD_CONFIG': 'Release', | 234 'BUILD_CONFIG': 'Release', |
226 'TARGET_BITS': 64, | 235 'TARGET_BITS': 64, |
227 }, | 236 }, |
228 'bot_type': 'tester', | 237 'bot_type': 'tester', |
229 'parent_buildername': 'WebKit Mac Builder', | 238 'parent_buildername': 'WebKit Mac Builder', |
230 'test_generators': [ | 239 'test_generators': [ |
231 steps.generate_gtest, | 240 steps.generate_gtest, |
232 steps.generate_script, | 241 steps.generate_script, |
233 ], | 242 ], |
234 'tests': [ | 243 'tests': [ |
235 steps.BlinkTest(), | 244 steps.BlinkTest(), |
236 ], | 245 ], |
237 'testing': { | 246 'testing': { |
238 'platform': 'mac', | 247 'platform': 'mac', |
239 }, | 248 }, |
240 'enable_swarming': True, | 249 'enable_swarming': True, |
241 'use_isolate': True, | 250 'use_isolate': True, |
242 }, | 251 }, |
243 'WebKit Mac10.7': { | 252 'WebKit Mac10.7': { |
244 'chromium_config': 'chromium', | 253 'chromium_config': 'chromium', |
| 254 'chromium_apply_config': ['mb'], |
245 'gclient_config': 'chromium', | 255 'gclient_config': 'chromium', |
246 'gclient_apply_config': ['blink_or_chromium'], | 256 'gclient_apply_config': ['blink_or_chromium'], |
247 'chromium_config_kwargs': { | 257 'chromium_config_kwargs': { |
248 'BUILD_CONFIG': 'Release', | 258 'BUILD_CONFIG': 'Release', |
249 'TARGET_BITS': 64, | 259 'TARGET_BITS': 64, |
250 }, | 260 }, |
251 'bot_type': 'tester', | 261 'bot_type': 'tester', |
252 'parent_buildername': 'WebKit Mac Builder', | 262 'parent_buildername': 'WebKit Mac Builder', |
253 'test_generators': [ | 263 'test_generators': [ |
254 steps.generate_gtest, | 264 steps.generate_gtest, |
255 steps.generate_script, | 265 steps.generate_script, |
256 ], | 266 ], |
257 'tests': [ | 267 'tests': [ |
258 steps.BlinkTest(), | 268 steps.BlinkTest(), |
259 ], | 269 ], |
260 'testing': { | 270 'testing': { |
261 'platform': 'mac', | 271 'platform': 'mac', |
262 }, | 272 }, |
263 'enable_swarming': True, | 273 'enable_swarming': True, |
264 'use_isolate': True, | 274 'use_isolate': True, |
265 }, | 275 }, |
266 'WebKit Mac10.8': { | 276 'WebKit Mac10.8': { |
267 'chromium_config': 'chromium', | 277 'chromium_config': 'chromium', |
| 278 'chromium_apply_config': ['mb'], |
268 'gclient_config': 'chromium', | 279 'gclient_config': 'chromium', |
269 'gclient_apply_config': ['blink_or_chromium'], | 280 'gclient_apply_config': ['blink_or_chromium'], |
270 'chromium_config_kwargs': { | 281 'chromium_config_kwargs': { |
271 'BUILD_CONFIG': 'Release', | 282 'BUILD_CONFIG': 'Release', |
272 'TARGET_BITS': 64, | 283 'TARGET_BITS': 64, |
273 }, | 284 }, |
274 'bot_type': 'tester', | 285 'bot_type': 'tester', |
275 'parent_buildername': 'WebKit Mac Builder', | 286 'parent_buildername': 'WebKit Mac Builder', |
276 'test_generators': [ | 287 'test_generators': [ |
277 steps.generate_gtest, | 288 steps.generate_gtest, |
278 steps.generate_script, | 289 steps.generate_script, |
279 ], | 290 ], |
280 'tests': [ | 291 'tests': [ |
281 steps.BlinkTest(), | 292 steps.BlinkTest(), |
282 ], | 293 ], |
283 'testing': { | 294 'testing': { |
284 'platform': 'mac', | 295 'platform': 'mac', |
285 }, | 296 }, |
286 'enable_swarming': True, | 297 'enable_swarming': True, |
287 'use_isolate': True, | 298 'use_isolate': True, |
288 }, | 299 }, |
289 'WebKit Mac10.9 (retina)': { | 300 'WebKit Mac10.9 (retina)': { |
290 'chromium_config': 'chromium', | 301 'chromium_config': 'chromium', |
| 302 'chromium_apply_config': ['mb'], |
291 'gclient_config': 'chromium', | 303 'gclient_config': 'chromium', |
292 'gclient_apply_config': ['blink_or_chromium'], | 304 'gclient_apply_config': ['blink_or_chromium'], |
293 'chromium_config_kwargs': { | 305 'chromium_config_kwargs': { |
294 'BUILD_CONFIG': 'Release', | 306 'BUILD_CONFIG': 'Release', |
295 'TARGET_BITS': 64, | 307 'TARGET_BITS': 64, |
296 }, | 308 }, |
297 'compile_targets': [ | 309 'compile_targets': [ |
298 'blink_tests', | 310 'blink_tests', |
299 ], | 311 ], |
300 'test_generators': [ | 312 'test_generators': [ |
301 steps.generate_gtest, | 313 steps.generate_gtest, |
302 steps.generate_script, | 314 steps.generate_script, |
303 ], | 315 ], |
304 'tests': [ | 316 'tests': [ |
305 steps.BlinkTest(), | 317 steps.BlinkTest(), |
306 ], | 318 ], |
307 'testing': { | 319 'testing': { |
308 'platform': 'mac', | 320 'platform': 'mac', |
309 }, | 321 }, |
310 'enable_swarming': True, | 322 'enable_swarming': True, |
311 'use_isolate': True, | 323 'use_isolate': True, |
312 }, | 324 }, |
313 'WebKit Mac10.9': { | 325 'WebKit Mac10.9': { |
314 'chromium_config': 'chromium', | 326 'chromium_config': 'chromium', |
| 327 'chromium_apply_config': ['mb'], |
315 'gclient_config': 'chromium', | 328 'gclient_config': 'chromium', |
316 'gclient_apply_config': ['blink_or_chromium'], | 329 'gclient_apply_config': ['blink_or_chromium'], |
317 'chromium_config_kwargs': { | 330 'chromium_config_kwargs': { |
318 'BUILD_CONFIG': 'Release', | 331 'BUILD_CONFIG': 'Release', |
319 'TARGET_BITS': 64, | 332 'TARGET_BITS': 64, |
320 }, | 333 }, |
321 'bot_type': 'tester', | 334 'bot_type': 'tester', |
322 'parent_buildername': 'WebKit Mac Builder', | 335 'parent_buildername': 'WebKit Mac Builder', |
323 'test_generators': [ | 336 'test_generators': [ |
324 steps.generate_gtest, | 337 steps.generate_gtest, |
325 steps.generate_script, | 338 steps.generate_script, |
326 ], | 339 ], |
327 'tests': [ | 340 'tests': [ |
328 steps.BlinkTest(), | 341 steps.BlinkTest(), |
329 ], | 342 ], |
330 'testing': { | 343 'testing': { |
331 'platform': 'mac', | 344 'platform': 'mac', |
332 }, | 345 }, |
333 'enable_swarming': True, | 346 'enable_swarming': True, |
334 'use_isolate': True, | 347 'use_isolate': True, |
335 }, | 348 }, |
336 'WebKit Mac10.10': { | 349 'WebKit Mac10.10': { |
337 'chromium_config': 'chromium', | 350 'chromium_config': 'chromium', |
| 351 'chromium_apply_config': ['mb'], |
338 'gclient_config': 'chromium', | 352 'gclient_config': 'chromium', |
339 'gclient_apply_config': ['blink_or_chromium'], | 353 'gclient_apply_config': ['blink_or_chromium'], |
340 'chromium_config_kwargs': { | 354 'chromium_config_kwargs': { |
341 'BUILD_CONFIG': 'Release', | 355 'BUILD_CONFIG': 'Release', |
342 'TARGET_BITS': 64, | 356 'TARGET_BITS': 64, |
343 }, | 357 }, |
344 'bot_type': 'tester', | 358 'bot_type': 'tester', |
345 'parent_buildername': 'WebKit Mac Builder', | 359 'parent_buildername': 'WebKit Mac Builder', |
346 'test_generators': [ | 360 'test_generators': [ |
347 steps.generate_gtest, | 361 steps.generate_gtest, |
348 steps.generate_script, | 362 steps.generate_script, |
349 ], | 363 ], |
350 'tests': [ | 364 'tests': [ |
351 steps.BlinkTest(), | 365 steps.BlinkTest(), |
352 ], | 366 ], |
353 'testing': { | 367 'testing': { |
354 'platform': 'mac', | 368 'platform': 'mac', |
355 }, | 369 }, |
356 'enable_swarming': True, | 370 'enable_swarming': True, |
357 'use_isolate': True, | 371 'use_isolate': True, |
358 }, | 372 }, |
359 'WebKit Mac Builder (dbg)': { | 373 'WebKit Mac Builder (dbg)': { |
360 'chromium_config': 'chromium', | 374 'chromium_config': 'chromium', |
| 375 'chromium_apply_config': ['mb'], |
361 'gclient_config': 'chromium', | 376 'gclient_config': 'chromium', |
362 'gclient_apply_config': ['blink_or_chromium'], | 377 'gclient_apply_config': ['blink_or_chromium'], |
363 'chromium_config_kwargs': { | 378 'chromium_config_kwargs': { |
364 'BUILD_CONFIG': 'Debug', | 379 'BUILD_CONFIG': 'Debug', |
365 'TARGET_BITS': 64, | 380 'TARGET_BITS': 64, |
366 }, | 381 }, |
367 'bot_type': 'builder', | 382 'bot_type': 'builder', |
368 'testing': { | 383 'testing': { |
369 'platform': 'mac', | 384 'platform': 'mac', |
370 }, | 385 }, |
371 'enable_swarming': True, | 386 'enable_swarming': True, |
372 'use_isolate': True, | 387 'use_isolate': True, |
373 }, | 388 }, |
374 'WebKit Mac10.7 (dbg)': { | 389 'WebKit Mac10.7 (dbg)': { |
375 'chromium_config': 'chromium', | 390 'chromium_config': 'chromium', |
| 391 'chromium_apply_config': ['mb'], |
376 'gclient_config': 'chromium', | 392 'gclient_config': 'chromium', |
377 'gclient_apply_config': ['blink_or_chromium'], | 393 'gclient_apply_config': ['blink_or_chromium'], |
378 'chromium_config_kwargs': { | 394 'chromium_config_kwargs': { |
379 'BUILD_CONFIG': 'Debug', | 395 'BUILD_CONFIG': 'Debug', |
380 'TARGET_BITS': 64, | 396 'TARGET_BITS': 64, |
381 }, | 397 }, |
382 'bot_type': 'tester', | 398 'bot_type': 'tester', |
383 'parent_buildername': 'WebKit Mac Builder (dbg)', | 399 'parent_buildername': 'WebKit Mac Builder (dbg)', |
384 'test_generators': [ | 400 'test_generators': [ |
385 steps.generate_gtest, | 401 steps.generate_gtest, |
386 steps.generate_script, | 402 steps.generate_script, |
387 ], | 403 ], |
388 'tests': [ | 404 'tests': [ |
389 steps.BlinkTest(), | 405 steps.BlinkTest(), |
390 ], | 406 ], |
391 'testing': { | 407 'testing': { |
392 'platform': 'mac', | 408 'platform': 'mac', |
393 }, | 409 }, |
394 'enable_swarming': True, | 410 'enable_swarming': True, |
395 'use_isolate': True, | 411 'use_isolate': True, |
396 }, | 412 }, |
397 'WebKit Linux': { | 413 'WebKit Linux': { |
398 'chromium_config': 'chromium', | 414 'chromium_config': 'chromium', |
399 'chromium_apply_config': ['ninja_confirm_noop'], | 415 'chromium_apply_config': ['mb', 'ninja_confirm_noop'], |
400 'gclient_config': 'chromium', | 416 'gclient_config': 'chromium', |
401 'gclient_apply_config': ['blink_or_chromium'], | 417 'gclient_apply_config': ['blink_or_chromium'], |
402 'chromium_config_kwargs': { | 418 'chromium_config_kwargs': { |
403 'BUILD_CONFIG': 'Release', | 419 'BUILD_CONFIG': 'Release', |
404 'TARGET_BITS': 64, | 420 'TARGET_BITS': 64, |
405 }, | 421 }, |
406 'compile_targets': [ | 422 'compile_targets': [ |
407 'blink_tests', | 423 'blink_tests', |
408 ], | 424 ], |
409 'test_generators': [ | 425 'test_generators': [ |
410 steps.generate_gtest, | 426 steps.generate_gtest, |
411 steps.generate_script, | 427 steps.generate_script, |
412 ], | 428 ], |
413 'tests': [ | 429 'tests': [ |
414 steps.BlinkTest(), | 430 steps.BlinkTest(), |
415 ], | 431 ], |
416 'testing': { | 432 'testing': { |
417 'platform': 'linux', | 433 'platform': 'linux', |
418 }, | 434 }, |
419 'enable_swarming': True, | 435 'enable_swarming': True, |
420 'use_isolate': True, | 436 'use_isolate': True, |
421 }, | 437 }, |
422 'WebKit Linux Trusty': { | 438 'WebKit Linux Trusty': { |
423 'chromium_config': 'chromium', | 439 'chromium_config': 'chromium', |
| 440 'chromium_apply_config': ['mb'], |
424 'gclient_config': 'chromium', | 441 'gclient_config': 'chromium', |
425 'gclient_apply_config': ['blink_or_chromium'], | 442 'gclient_apply_config': ['blink_or_chromium'], |
426 'chromium_config_kwargs': { | 443 'chromium_config_kwargs': { |
427 'BUILD_CONFIG': 'Release', | 444 'BUILD_CONFIG': 'Release', |
428 'TARGET_BITS': 64, | 445 'TARGET_BITS': 64, |
429 }, | 446 }, |
430 'compile_targets': [ | 447 'compile_targets': [ |
431 'blink_tests', | 448 'blink_tests', |
432 ], | 449 ], |
433 'test_generators': [ | 450 'test_generators': [ |
434 steps.generate_gtest, | 451 steps.generate_gtest, |
435 steps.generate_script, | 452 steps.generate_script, |
436 ], | 453 ], |
437 'tests': [ | 454 'tests': [ |
438 steps.BlinkTest(), | 455 steps.BlinkTest(), |
439 ], | 456 ], |
440 'testing': { | 457 'testing': { |
441 'platform': 'linux', | 458 'platform': 'linux', |
442 }, | 459 }, |
443 'enable_swarming': True, | 460 'enable_swarming': True, |
444 'use_isolate': True, | 461 'use_isolate': True, |
445 }, | 462 }, |
446 'WebKit Linux 32': { | 463 'WebKit Linux 32': { |
447 'chromium_config': 'chromium', | 464 'chromium_config': 'chromium', |
| 465 'chromium_apply_config': ['mb'], |
448 'gclient_config': 'chromium', | 466 'gclient_config': 'chromium', |
449 'gclient_apply_config': ['blink_or_chromium'], | 467 'gclient_apply_config': ['blink_or_chromium'], |
450 'chromium_config_kwargs': { | 468 'chromium_config_kwargs': { |
451 'BUILD_CONFIG': 'Release', | 469 'BUILD_CONFIG': 'Release', |
452 'TARGET_BITS': 32, | 470 'TARGET_BITS': 32, |
453 }, | 471 }, |
454 'test_generators': [ | 472 'test_generators': [ |
455 steps.generate_gtest, | 473 steps.generate_gtest, |
456 steps.generate_script, | 474 steps.generate_script, |
457 ], | 475 ], |
458 'tests': [ | 476 'tests': [ |
459 steps.BlinkTest(), | 477 steps.BlinkTest(), |
460 ], | 478 ], |
461 'testing': { | 479 'testing': { |
462 'platform': 'linux', | 480 'platform': 'linux', |
463 }, | 481 }, |
464 'enable_swarming': True, | 482 'enable_swarming': True, |
465 'use_isolate': True, | 483 'use_isolate': True, |
466 }, | 484 }, |
467 'WebKit Linux ASAN': { | 485 'WebKit Linux ASAN': { |
468 'chromium_config': 'chromium_clang', | 486 'chromium_config': 'chromium_clang', |
| 487 'chromium_apply_config': ['asan', 'mb'], |
469 'gclient_config': 'chromium', | 488 'gclient_config': 'chromium', |
470 'chromium_apply_config': ['asan'], | |
471 'gclient_apply_config': ['blink_or_chromium'], | 489 'gclient_apply_config': ['blink_or_chromium'], |
472 'chromium_config_kwargs': { | 490 'chromium_config_kwargs': { |
473 'BUILD_CONFIG': 'Release', | 491 'BUILD_CONFIG': 'Release', |
474 'TARGET_BITS': 64, | 492 'TARGET_BITS': 64, |
475 }, | 493 }, |
476 'test_generators': [ | 494 'test_generators': [ |
477 steps.generate_gtest, | 495 steps.generate_gtest, |
478 steps.generate_script, | 496 steps.generate_script, |
479 ], | 497 ], |
480 'tests': [ | 498 'tests': [ |
481 steps.BlinkTest(extra_args=[ | 499 steps.BlinkTest(extra_args=[ |
482 '--additional-expectations', | 500 '--additional-expectations', |
483 'src/third_party/WebKit/LayoutTests/ASANExpectations', | 501 'src/third_party/WebKit/LayoutTests/ASANExpectations', |
484 # ASAN is roughly 8x slower than Release. | 502 # ASAN is roughly 8x slower than Release. |
485 '--time-out-ms', '48000', | 503 '--time-out-ms', '48000', |
486 '--options=--enable-sanitizer', | 504 '--options=--enable-sanitizer', |
487 ]), | 505 ]), |
488 ], | 506 ], |
489 'testing': { | 507 'testing': { |
490 'platform': 'linux', | 508 'platform': 'linux', |
491 }, | 509 }, |
492 'enable_swarming': True, | 510 'enable_swarming': True, |
493 'use_isolate': True, | 511 'use_isolate': True, |
494 }, | 512 }, |
495 'WebKit Linux MSAN': { | 513 'WebKit Linux MSAN': { |
496 'chromium_config': 'chromium_clang', | 514 'chromium_config': 'chromium_clang', |
497 'gclient_config': 'chromium', | 515 'gclient_config': 'chromium', |
498 'chromium_apply_config': [ | 516 'chromium_apply_config': [ |
499 'prebuilt_instrumented_libraries', | 517 'mb', |
500 'msan', | 518 'msan', |
501 'msan_full_origin_tracking', | 519 'msan_full_origin_tracking', |
| 520 'prebuilt_instrumented_libraries', |
502 ], | 521 ], |
503 'gclient_apply_config': ['blink_or_chromium'], | 522 'gclient_apply_config': ['blink_or_chromium'], |
504 'chromium_config_kwargs': { | 523 'chromium_config_kwargs': { |
505 'BUILD_CONFIG': 'Release', | 524 'BUILD_CONFIG': 'Release', |
506 'TARGET_BITS': 64, | 525 'TARGET_BITS': 64, |
507 }, | 526 }, |
508 'test_generators': [ | 527 'test_generators': [ |
509 steps.generate_gtest, | 528 steps.generate_gtest, |
510 steps.generate_script, | 529 steps.generate_script, |
511 ], | 530 ], |
512 'tests': [ | 531 'tests': [ |
513 steps.BlinkTest(extra_args=[ | 532 steps.BlinkTest(extra_args=[ |
514 '--additional-expectations', | 533 '--additional-expectations', |
515 'src/third_party/WebKit/LayoutTests/MSANExpectations', | 534 'src/third_party/WebKit/LayoutTests/MSANExpectations', |
516 # Because JS code is run on a simulator, the slowdown in JS-heavy | 535 # Because JS code is run on a simulator, the slowdown in JS-heavy |
517 # tests will be much higher than MSan's average of 3x. | 536 # tests will be much higher than MSan's average of 3x. |
518 '--time-out-ms', '66000', | 537 '--time-out-ms', '66000', |
519 '--options=--enable-sanitizer', | 538 '--options=--enable-sanitizer', |
520 ]), | 539 ]), |
521 ], | 540 ], |
522 'testing': { | 541 'testing': { |
523 'platform': 'linux', | 542 'platform': 'linux', |
524 }, | 543 }, |
525 'enable_swarming': True, | 544 'enable_swarming': True, |
526 'use_isolate': True, | 545 'use_isolate': True, |
527 }, | 546 }, |
528 'WebKit Linux (dbg)': { | 547 'WebKit Linux (dbg)': { |
529 'chromium_config': 'chromium', | 548 'chromium_config': 'chromium', |
| 549 'chromium_apply_config': ['mb'], |
530 'gclient_config': 'chromium', | 550 'gclient_config': 'chromium', |
531 'gclient_apply_config': ['blink_or_chromium'], | 551 'gclient_apply_config': ['blink_or_chromium'], |
532 'chromium_config_kwargs': { | 552 'chromium_config_kwargs': { |
533 'BUILD_CONFIG': 'Debug', | 553 'BUILD_CONFIG': 'Debug', |
534 'TARGET_BITS': 64, | 554 'TARGET_BITS': 64, |
535 }, | 555 }, |
536 'test_generators': [ | 556 'test_generators': [ |
537 steps.generate_gtest, | 557 steps.generate_gtest, |
538 steps.generate_script, | 558 steps.generate_script, |
539 ], | 559 ], |
540 'tests': [ | 560 'tests': [ |
541 steps.BlinkTest(), | 561 steps.BlinkTest(), |
542 ], | 562 ], |
543 'testing': { | 563 'testing': { |
544 'platform': 'linux', | 564 'platform': 'linux', |
545 }, | 565 }, |
546 'enable_swarming': True, | 566 'enable_swarming': True, |
547 'use_isolate': True, | 567 'use_isolate': True, |
548 }, | 568 }, |
549 'Android Builder': { | 569 'Android Builder': { |
550 'chromium_config': 'android', | 570 'chromium_config': 'android', |
| 571 'chromium_apply_config': ['mb'], |
551 'gclient_config': 'chromium', | 572 'gclient_config': 'chromium', |
552 'gclient_apply_config': ['android', 'blink_or_chromium'], | 573 'gclient_apply_config': ['android', 'blink_or_chromium'], |
553 'chromium_config_kwargs': { | 574 'chromium_config_kwargs': { |
554 'BUILD_CONFIG': 'Release', | 575 'BUILD_CONFIG': 'Release', |
555 'TARGET_BITS': 32, | 576 'TARGET_BITS': 32, |
556 'TARGET_PLATFORM': 'android', | 577 'TARGET_PLATFORM': 'android', |
557 }, | 578 }, |
558 'android_config': 'main_builder', | 579 'android_config': 'main_builder', |
559 'bot_type': 'builder', | 580 'bot_type': 'builder', |
560 'testing': { | 581 'testing': { |
561 'platform': 'linux', | 582 'platform': 'linux', |
562 }, | 583 }, |
563 }, | 584 }, |
564 'WebKit Android (Nexus4)': { | 585 'WebKit Android (Nexus4)': { |
565 'chromium_config': 'android', | 586 'chromium_config': 'android', |
| 587 'chromium_apply_config': ['mb'], |
566 'gclient_config': 'chromium', | 588 'gclient_config': 'chromium', |
567 'gclient_apply_config': ['android', 'blink_or_chromium'], | 589 'gclient_apply_config': ['android', 'blink_or_chromium'], |
568 'chromium_config_kwargs': { | 590 'chromium_config_kwargs': { |
569 'BUILD_CONFIG': 'Release', | 591 'BUILD_CONFIG': 'Release', |
570 'TARGET_BITS': 32, | 592 'TARGET_BITS': 32, |
571 'TARGET_PLATFORM': 'android', | 593 'TARGET_PLATFORM': 'android', |
572 }, | 594 }, |
573 'bot_type': 'tester', | 595 'bot_type': 'tester', |
574 'parent_buildername': 'Android Builder', | 596 'parent_buildername': 'Android Builder', |
575 'android_config': 'main_builder', | 597 'android_config': 'main_builder', |
576 'root_devices': True, | 598 'root_devices': True, |
577 'tests': [ | 599 'tests': [ |
578 steps.GTestTest('blink_heap_unittests'), | 600 steps.GTestTest('blink_heap_unittests'), |
579 steps.GTestTest('webkit_unit_tests'), | 601 steps.GTestTest('webkit_unit_tests'), |
580 steps.BlinkTest(), | 602 steps.BlinkTest(), |
581 ], | 603 ], |
582 'test_generators': [ | 604 'test_generators': [ |
583 steps.generate_gtest, | 605 steps.generate_gtest, |
584 steps.generate_script, | 606 steps.generate_script, |
585 ], | 607 ], |
586 'testing': { | 608 'testing': { |
587 'platform': 'linux', | 609 'platform': 'linux', |
588 }, | 610 }, |
589 }, | 611 }, |
590 'WebKit Win Oilpan': { | 612 'WebKit Win Oilpan': { |
591 'chromium_config': 'chromium', | 613 'chromium_config': 'chromium', |
| 614 'chromium_apply_config': ['mb'], |
592 'gclient_config': 'chromium', | 615 'gclient_config': 'chromium', |
593 'gclient_apply_config': ['blink_or_chromium'], | 616 'gclient_apply_config': ['blink_or_chromium'], |
594 'chromium_apply_config': ['oilpan'], | 617 'chromium_apply_config': ['oilpan'], |
595 'chromium_config_kwargs': { | 618 'chromium_config_kwargs': { |
596 'BUILD_CONFIG': 'Release', | 619 'BUILD_CONFIG': 'Release', |
597 'TARGET_BITS': 32, | 620 'TARGET_BITS': 32, |
598 }, | 621 }, |
599 'compile_targets': [ | 622 'compile_targets': [ |
600 # TODO(phajdan.jr): Find a way to automatically add crash_service | 623 # TODO(phajdan.jr): Find a way to automatically add crash_service |
601 # to Windows builds (so that start_crash_service step works). | 624 # to Windows builds (so that start_crash_service step works). |
(...skipping 10 matching lines...) Expand all Loading... |
612 ]), | 635 ]), |
613 ], | 636 ], |
614 'testing': { | 637 'testing': { |
615 'platform': 'win', | 638 'platform': 'win', |
616 }, | 639 }, |
617 'enable_swarming': True, | 640 'enable_swarming': True, |
618 'use_isolate': True, | 641 'use_isolate': True, |
619 }, | 642 }, |
620 'WebKit Win Oilpan (dbg)': { | 643 'WebKit Win Oilpan (dbg)': { |
621 'chromium_config': 'chromium', | 644 'chromium_config': 'chromium', |
| 645 'chromium_apply_config': ['mb', 'oilpan'], |
622 'gclient_config': 'chromium', | 646 'gclient_config': 'chromium', |
623 'gclient_apply_config': ['blink_or_chromium'], | 647 'gclient_apply_config': ['blink_or_chromium'], |
624 'chromium_apply_config': ['oilpan'], | |
625 'chromium_config_kwargs': { | 648 'chromium_config_kwargs': { |
626 'BUILD_CONFIG': 'Debug', | 649 'BUILD_CONFIG': 'Debug', |
627 'TARGET_BITS': 32, | 650 'TARGET_BITS': 32, |
628 }, | 651 }, |
629 'compile_targets': [ | 652 'compile_targets': [ |
630 # TODO(phajdan.jr): Find a way to automatically add crash_service | 653 # TODO(phajdan.jr): Find a way to automatically add crash_service |
631 # to Windows builds (so that start_crash_service step works). | 654 # to Windows builds (so that start_crash_service step works). |
632 'crash_service', | 655 'crash_service', |
633 ], | 656 ], |
634 'test_generators': [ | 657 'test_generators': [ |
635 steps.generate_gtest, | 658 steps.generate_gtest, |
636 steps.generate_script, | 659 steps.generate_script, |
637 ], | 660 ], |
638 'tests': [ | 661 'tests': [ |
639 steps.BlinkTest(extra_args=[ | 662 steps.BlinkTest(extra_args=[ |
640 '--additional-expectations', | 663 '--additional-expectations', |
641 'src\\third_party\\WebKit\\LayoutTests\\OilpanExpectations', | 664 'src\\third_party\\WebKit\\LayoutTests\\OilpanExpectations', |
642 ]), | 665 ]), |
643 ], | 666 ], |
644 'testing': { | 667 'testing': { |
645 'platform': 'win', | 668 'platform': 'win', |
646 }, | 669 }, |
647 'enable_swarming': True, | 670 'enable_swarming': True, |
648 'use_isolate': True, | 671 'use_isolate': True, |
649 }, | 672 }, |
650 'WebKit Mac Oilpan': { | 673 'WebKit Mac Oilpan': { |
651 'chromium_config': 'chromium', | 674 'chromium_config': 'chromium', |
| 675 'chromium_apply_config': ['mb', 'oilpan'], |
652 'gclient_config': 'chromium', | 676 'gclient_config': 'chromium', |
653 'gclient_apply_config': ['blink_or_chromium'], | 677 'gclient_apply_config': ['blink_or_chromium'], |
654 'chromium_apply_config': ['oilpan'], | |
655 'chromium_config_kwargs': { | 678 'chromium_config_kwargs': { |
656 'BUILD_CONFIG': 'Release', | 679 'BUILD_CONFIG': 'Release', |
657 'TARGET_BITS': 64, | 680 'TARGET_BITS': 64, |
658 }, | 681 }, |
659 'test_generators': [ | 682 'test_generators': [ |
660 steps.generate_gtest, | 683 steps.generate_gtest, |
661 steps.generate_script, | 684 steps.generate_script, |
662 ], | 685 ], |
663 'tests': [ | 686 'tests': [ |
664 steps.BlinkTest(extra_args=[ | 687 steps.BlinkTest(extra_args=[ |
665 '--additional-expectations', | 688 '--additional-expectations', |
666 'src/third_party/WebKit/LayoutTests/OilpanExpectations', | 689 'src/third_party/WebKit/LayoutTests/OilpanExpectations', |
667 ]), | 690 ]), |
668 ], | 691 ], |
669 'testing': { | 692 'testing': { |
670 'platform': 'mac', | 693 'platform': 'mac', |
671 }, | 694 }, |
672 'enable_swarming': True, | 695 'enable_swarming': True, |
673 'use_isolate': True, | 696 'use_isolate': True, |
674 }, | 697 }, |
675 'WebKit Mac Oilpan (dbg)': { | 698 'WebKit Mac Oilpan (dbg)': { |
676 'chromium_config': 'chromium', | 699 'chromium_config': 'chromium', |
| 700 'chromium_apply_config': ['mb', 'oilpan'], |
677 'gclient_config': 'chromium', | 701 'gclient_config': 'chromium', |
678 'gclient_apply_config': ['blink_or_chromium'], | 702 'gclient_apply_config': ['blink_or_chromium'], |
679 'chromium_apply_config': ['oilpan'], | |
680 'chromium_config_kwargs': { | 703 'chromium_config_kwargs': { |
681 'BUILD_CONFIG': 'Debug', | 704 'BUILD_CONFIG': 'Debug', |
682 'TARGET_BITS': 64, | 705 'TARGET_BITS': 64, |
683 }, | 706 }, |
684 'test_generators': [ | 707 'test_generators': [ |
685 steps.generate_gtest, | 708 steps.generate_gtest, |
686 steps.generate_script, | 709 steps.generate_script, |
687 ], | 710 ], |
688 'tests': [ | 711 'tests': [ |
689 steps.BlinkTest(extra_args=[ | 712 steps.BlinkTest(extra_args=[ |
690 '--additional-expectations', | 713 '--additional-expectations', |
691 'src/third_party/WebKit/LayoutTests/OilpanExpectations', | 714 'src/third_party/WebKit/LayoutTests/OilpanExpectations', |
692 ]), | 715 ]), |
693 ], | 716 ], |
694 'testing': { | 717 'testing': { |
695 'platform': 'mac', | 718 'platform': 'mac', |
696 }, | 719 }, |
697 'enable_swarming': True, | 720 'enable_swarming': True, |
698 'use_isolate': True, | 721 'use_isolate': True, |
699 }, | 722 }, |
700 'WebKit Linux Oilpan': { | 723 'WebKit Linux Oilpan': { |
701 'chromium_config': 'chromium', | 724 'chromium_config': 'chromium', |
| 725 'chromium_apply_config': ['mb', 'oilpan'], |
702 'gclient_config': 'chromium', | 726 'gclient_config': 'chromium', |
703 'gclient_apply_config': ['blink_or_chromium'], | 727 'gclient_apply_config': ['blink_or_chromium'], |
704 'chromium_apply_config': ['oilpan'], | |
705 'chromium_config_kwargs': { | 728 'chromium_config_kwargs': { |
706 'BUILD_CONFIG': 'Release', | 729 'BUILD_CONFIG': 'Release', |
707 'TARGET_BITS': 64, | 730 'TARGET_BITS': 64, |
708 }, | 731 }, |
709 'compile_targets': [ | 732 'compile_targets': [ |
710 'blink_tests', | 733 'blink_tests', |
711 ], | 734 ], |
712 'test_generators': [ | 735 'test_generators': [ |
713 steps.generate_gtest, | 736 steps.generate_gtest, |
714 steps.generate_script, | 737 steps.generate_script, |
715 ], | 738 ], |
716 'tests': [ | 739 'tests': [ |
717 steps.BlinkTest(extra_args=[ | 740 steps.BlinkTest(extra_args=[ |
718 '--additional-expectations', | 741 '--additional-expectations', |
719 'src/third_party/WebKit/LayoutTests/OilpanExpectations', | 742 'src/third_party/WebKit/LayoutTests/OilpanExpectations', |
720 ]), | 743 ]), |
721 ], | 744 ], |
722 'testing': { | 745 'testing': { |
723 'platform': 'linux', | 746 'platform': 'linux', |
724 }, | 747 }, |
725 'enable_swarming': True, | 748 'enable_swarming': True, |
726 'use_isolate': True, | 749 'use_isolate': True, |
727 }, | 750 }, |
728 'WebKit Linux Oilpan ASAN': { | 751 'WebKit Linux Oilpan ASAN': { |
729 'chromium_config': 'chromium_clang', | 752 'chromium_config': 'chromium_clang', |
| 753 'chromium_apply_config': ['asan', 'mb', 'oilpan'], |
730 'gclient_config': 'chromium', | 754 'gclient_config': 'chromium', |
731 'gclient_apply_config': ['blink_or_chromium'], | 755 'gclient_apply_config': ['blink_or_chromium'], |
732 'chromium_apply_config': ['oilpan', 'asan'], | |
733 'chromium_config_kwargs': { | 756 'chromium_config_kwargs': { |
734 'BUILD_CONFIG': 'Release', | 757 'BUILD_CONFIG': 'Release', |
735 'TARGET_BITS': 64, | 758 'TARGET_BITS': 64, |
736 }, | 759 }, |
737 'compile_targets': [ | 760 'compile_targets': [ |
738 'blink_tests', | 761 'blink_tests', |
739 ], | 762 ], |
740 'test_generators': [ | 763 'test_generators': [ |
741 steps.generate_gtest, | 764 steps.generate_gtest, |
742 steps.generate_script, | 765 steps.generate_script, |
743 ], | 766 ], |
744 'tests': [ | 767 'tests': [ |
745 steps.BlinkTest(extra_args=[ | 768 steps.BlinkTest(extra_args=[ |
746 '--additional-expectations', | 769 '--additional-expectations', |
747 'src/third_party/WebKit/LayoutTests/ASANExpectations', | 770 'src/third_party/WebKit/LayoutTests/ASANExpectations', |
748 # ASAN is roughly 8x slower than Release. | 771 # ASAN is roughly 8x slower than Release. |
749 '--time-out-ms', '48000', | 772 '--time-out-ms', '48000', |
750 '--options=--enable-sanitizer', | 773 '--options=--enable-sanitizer', |
751 ]), | 774 ]), |
752 ], | 775 ], |
753 'testing': { | 776 'testing': { |
754 'platform': 'linux', | 777 'platform': 'linux', |
755 }, | 778 }, |
756 'enable_swarming': True, | 779 'enable_swarming': True, |
757 'use_isolate': True, | 780 'use_isolate': True, |
758 }, | 781 }, |
759 'WebKit Linux Leak': { | 782 'WebKit Linux Leak': { |
760 'chromium_config': 'chromium', | 783 'chromium_config': 'chromium', |
| 784 'chromium_apply_config': ['mb'], |
761 'gclient_config': 'chromium', | 785 'gclient_config': 'chromium', |
762 'gclient_apply_config': ['blink_or_chromium'], | 786 'gclient_apply_config': ['blink_or_chromium'], |
763 'chromium_config_kwargs': { | 787 'chromium_config_kwargs': { |
764 'BUILD_CONFIG': 'Release', | 788 'BUILD_CONFIG': 'Release', |
765 'TARGET_BITS': 64, | 789 'TARGET_BITS': 64, |
766 }, | 790 }, |
767 'compile_targets': [ | 791 'compile_targets': [ |
768 'blink_tests', | 792 'blink_tests', |
769 ], | 793 ], |
770 'test_generators': [ | 794 'test_generators': [ |
771 steps.generate_gtest, | 795 steps.generate_gtest, |
772 steps.generate_script, | 796 steps.generate_script, |
773 ], | 797 ], |
774 'tests': [ | 798 'tests': [ |
775 steps.BlinkTest(extra_args=[ | 799 steps.BlinkTest(extra_args=[ |
776 '--additional-expectations', | 800 '--additional-expectations', |
777 'src/third_party/WebKit/LayoutTests/LeakExpectations', | 801 'src/third_party/WebKit/LayoutTests/LeakExpectations', |
778 '--options=--enable-leak-detection', | 802 '--options=--enable-leak-detection', |
779 ]), | 803 ]), |
780 ], | 804 ], |
781 'testing': { | 805 'testing': { |
782 'platform': 'linux', | 806 'platform': 'linux', |
783 }, | 807 }, |
784 'enable_swarming': True, | 808 'enable_swarming': True, |
785 'use_isolate': True, | 809 'use_isolate': True, |
786 }, | 810 }, |
787 'WebKit Linux Oilpan Leak': { | 811 'WebKit Linux Oilpan Leak': { |
788 'chromium_config': 'chromium', | 812 'chromium_config': 'chromium', |
| 813 'chromium_apply_config': ['mb', 'oilpan'], |
789 'gclient_config': 'chromium', | 814 'gclient_config': 'chromium', |
790 'gclient_apply_config': ['blink_or_chromium'], | 815 'gclient_apply_config': ['blink_or_chromium'], |
791 'chromium_apply_config': ['oilpan'], | |
792 'chromium_config_kwargs': { | 816 'chromium_config_kwargs': { |
793 'BUILD_CONFIG': 'Release', | 817 'BUILD_CONFIG': 'Release', |
794 'TARGET_BITS': 64, | 818 'TARGET_BITS': 64, |
795 }, | 819 }, |
796 'compile_targets': [ | 820 'compile_targets': [ |
797 'blink_tests', | 821 'blink_tests', |
798 ], | 822 ], |
799 'test_generators': [ | 823 'test_generators': [ |
800 steps.generate_gtest, | 824 steps.generate_gtest, |
801 steps.generate_script, | 825 steps.generate_script, |
(...skipping 10 matching lines...) Expand all Loading... |
812 ]), | 836 ]), |
813 ], | 837 ], |
814 'testing': { | 838 'testing': { |
815 'platform': 'linux', | 839 'platform': 'linux', |
816 }, | 840 }, |
817 'enable_swarming': True, | 841 'enable_swarming': True, |
818 'use_isolate': True, | 842 'use_isolate': True, |
819 }, | 843 }, |
820 'WebKit Linux Oilpan (dbg)': { | 844 'WebKit Linux Oilpan (dbg)': { |
821 'chromium_config': 'chromium', | 845 'chromium_config': 'chromium', |
| 846 'chromium_apply_config': ['mb', 'oilpan'], |
822 'gclient_config': 'chromium', | 847 'gclient_config': 'chromium', |
823 'gclient_apply_config': ['blink_or_chromium'], | 848 'gclient_apply_config': ['blink_or_chromium'], |
824 'chromium_apply_config': ['oilpan'], | |
825 'chromium_config_kwargs': { | 849 'chromium_config_kwargs': { |
826 'BUILD_CONFIG': 'Debug', | 850 'BUILD_CONFIG': 'Debug', |
827 'TARGET_BITS': 64, | 851 'TARGET_BITS': 64, |
828 }, | 852 }, |
829 'compile_targets': [ | 853 'compile_targets': [ |
830 'blink_tests', | 854 'blink_tests', |
831 ], | 855 ], |
832 'test_generators': [ | 856 'test_generators': [ |
833 steps.generate_gtest, | 857 steps.generate_gtest, |
834 steps.generate_script, | 858 steps.generate_script, |
835 ], | 859 ], |
836 'tests': [ | 860 'tests': [ |
837 steps.BlinkTest(extra_args=[ | 861 steps.BlinkTest(extra_args=[ |
838 '--additional-expectations', | 862 '--additional-expectations', |
839 'src/third_party/WebKit/LayoutTests/OilpanExpectations', | 863 'src/third_party/WebKit/LayoutTests/OilpanExpectations', |
840 ]), | 864 ]), |
841 ], | 865 ], |
842 'testing': { | 866 'testing': { |
843 'platform': 'linux', | 867 'platform': 'linux', |
844 }, | 868 }, |
845 'enable_swarming': True, | 869 'enable_swarming': True, |
846 'use_isolate': True, | 870 'use_isolate': True, |
847 }, | 871 }, |
848 }) | 872 }) |
OLD | NEW |