| 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) |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 }, | 212 }, |
| 213 'bot_type': 'builder', | 213 'bot_type': 'builder', |
| 214 'testing': { | 214 'testing': { |
| 215 'platform': 'mac', | 215 'platform': 'mac', |
| 216 }, | 216 }, |
| 217 'enable_swarming': True, | 217 'enable_swarming': True, |
| 218 'use_isolate': True, | 218 'use_isolate': True, |
| 219 }, | 219 }, |
| 220 'WebKit Mac10.6': { | 220 'WebKit Mac10.6': { |
| 221 'chromium_config': 'chromium', | 221 'chromium_config': 'chromium', |
| 222 'chromium_apply_config': ['chromium_mac_sdk_10_10'], | |
| 223 'gclient_config': 'chromium', | 222 'gclient_config': 'chromium', |
| 224 'gclient_apply_config': ['blink_or_chromium'], | 223 'gclient_apply_config': ['blink_or_chromium'], |
| 225 'chromium_config_kwargs': { | 224 'chromium_config_kwargs': { |
| 226 'BUILD_CONFIG': 'Release', | 225 'BUILD_CONFIG': 'Release', |
| 227 'TARGET_BITS': 64, | 226 'TARGET_BITS': 64, |
| 228 }, | 227 }, |
| 229 'bot_type': 'tester', | 228 'bot_type': 'tester', |
| 230 'parent_buildername': 'WebKit Mac Builder', | 229 'parent_buildername': 'WebKit Mac Builder', |
| 231 'test_generators': [ | 230 'test_generators': [ |
| 232 steps.generate_gtest, | 231 steps.generate_gtest, |
| 233 steps.generate_script, | 232 steps.generate_script, |
| 234 ], | 233 ], |
| 235 'tests': [ | 234 'tests': [ |
| 236 steps.BlinkTest(), | 235 steps.BlinkTest(), |
| 237 ], | 236 ], |
| 238 'testing': { | 237 'testing': { |
| 239 'platform': 'mac', | 238 'platform': 'mac', |
| 240 }, | 239 }, |
| 241 'enable_swarming': True, | 240 'enable_swarming': True, |
| 242 'use_isolate': True, | 241 'use_isolate': True, |
| 243 }, | 242 }, |
| 244 'WebKit Mac10.7': { | 243 'WebKit Mac10.7': { |
| 245 'chromium_config': 'chromium', | 244 'chromium_config': 'chromium', |
| 246 'chromium_apply_config': ['chromium_mac_sdk_10_10'], | |
| 247 'gclient_config': 'chromium', | 245 'gclient_config': 'chromium', |
| 248 'gclient_apply_config': ['blink_or_chromium'], | 246 'gclient_apply_config': ['blink_or_chromium'], |
| 249 'chromium_config_kwargs': { | 247 'chromium_config_kwargs': { |
| 250 'BUILD_CONFIG': 'Release', | 248 'BUILD_CONFIG': 'Release', |
| 251 'TARGET_BITS': 64, | 249 'TARGET_BITS': 64, |
| 252 }, | 250 }, |
| 253 'bot_type': 'tester', | 251 'bot_type': 'tester', |
| 254 'parent_buildername': 'WebKit Mac Builder', | 252 'parent_buildername': 'WebKit Mac Builder', |
| 255 'test_generators': [ | 253 'test_generators': [ |
| 256 steps.generate_gtest, | 254 steps.generate_gtest, |
| 257 steps.generate_script, | 255 steps.generate_script, |
| 258 ], | 256 ], |
| 259 'tests': [ | 257 'tests': [ |
| 260 steps.BlinkTest(), | 258 steps.BlinkTest(), |
| 261 ], | 259 ], |
| 262 'testing': { | 260 'testing': { |
| 263 'platform': 'mac', | 261 'platform': 'mac', |
| 264 }, | 262 }, |
| 265 'enable_swarming': True, | 263 'enable_swarming': True, |
| 266 'use_isolate': True, | 264 'use_isolate': True, |
| 267 }, | 265 }, |
| 268 'WebKit Mac10.8': { | 266 'WebKit Mac10.8': { |
| 269 'chromium_config': 'chromium', | 267 'chromium_config': 'chromium', |
| 270 'chromium_apply_config': ['chromium_mac_sdk_10_10'], | |
| 271 'gclient_config': 'chromium', | 268 'gclient_config': 'chromium', |
| 272 'gclient_apply_config': ['blink_or_chromium'], | 269 'gclient_apply_config': ['blink_or_chromium'], |
| 273 'chromium_config_kwargs': { | 270 'chromium_config_kwargs': { |
| 274 'BUILD_CONFIG': 'Release', | 271 'BUILD_CONFIG': 'Release', |
| 275 'TARGET_BITS': 64, | 272 'TARGET_BITS': 64, |
| 276 }, | 273 }, |
| 277 'bot_type': 'tester', | 274 'bot_type': 'tester', |
| 278 'parent_buildername': 'WebKit Mac Builder', | 275 'parent_buildername': 'WebKit Mac Builder', |
| 279 'test_generators': [ | 276 'test_generators': [ |
| 280 steps.generate_gtest, | 277 steps.generate_gtest, |
| (...skipping 27 matching lines...) Expand all Loading... |
| 308 steps.BlinkTest(), | 305 steps.BlinkTest(), |
| 309 ], | 306 ], |
| 310 'testing': { | 307 'testing': { |
| 311 'platform': 'mac', | 308 'platform': 'mac', |
| 312 }, | 309 }, |
| 313 'enable_swarming': True, | 310 'enable_swarming': True, |
| 314 'use_isolate': True, | 311 'use_isolate': True, |
| 315 }, | 312 }, |
| 316 'WebKit Mac10.9': { | 313 'WebKit Mac10.9': { |
| 317 'chromium_config': 'chromium', | 314 'chromium_config': 'chromium', |
| 318 'chromium_apply_config': ['chromium_mac_sdk_10_10'], | |
| 319 'gclient_config': 'chromium', | 315 'gclient_config': 'chromium', |
| 320 'gclient_apply_config': ['blink_or_chromium'], | 316 'gclient_apply_config': ['blink_or_chromium'], |
| 321 'chromium_config_kwargs': { | 317 'chromium_config_kwargs': { |
| 322 'BUILD_CONFIG': 'Release', | 318 'BUILD_CONFIG': 'Release', |
| 323 'TARGET_BITS': 64, | 319 'TARGET_BITS': 64, |
| 324 }, | 320 }, |
| 325 'bot_type': 'tester', | 321 'bot_type': 'tester', |
| 326 'parent_buildername': 'WebKit Mac Builder', | 322 'parent_buildername': 'WebKit Mac Builder', |
| 327 'test_generators': [ | 323 'test_generators': [ |
| 328 steps.generate_gtest, | 324 steps.generate_gtest, |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 }, | 366 }, |
| 371 'bot_type': 'builder', | 367 'bot_type': 'builder', |
| 372 'testing': { | 368 'testing': { |
| 373 'platform': 'mac', | 369 'platform': 'mac', |
| 374 }, | 370 }, |
| 375 'enable_swarming': True, | 371 'enable_swarming': True, |
| 376 'use_isolate': True, | 372 'use_isolate': True, |
| 377 }, | 373 }, |
| 378 'WebKit Mac10.7 (dbg)': { | 374 'WebKit Mac10.7 (dbg)': { |
| 379 'chromium_config': 'chromium', | 375 'chromium_config': 'chromium', |
| 380 'chromium_apply_config': ['chromium_mac_sdk_10_10'], | |
| 381 'gclient_config': 'chromium', | 376 'gclient_config': 'chromium', |
| 382 'gclient_apply_config': ['blink_or_chromium'], | 377 'gclient_apply_config': ['blink_or_chromium'], |
| 383 'chromium_config_kwargs': { | 378 'chromium_config_kwargs': { |
| 384 'BUILD_CONFIG': 'Debug', | 379 'BUILD_CONFIG': 'Debug', |
| 385 'TARGET_BITS': 64, | 380 'TARGET_BITS': 64, |
| 386 }, | 381 }, |
| 387 'bot_type': 'tester', | 382 'bot_type': 'tester', |
| 388 'parent_buildername': 'WebKit Mac Builder (dbg)', | 383 'parent_buildername': 'WebKit Mac Builder (dbg)', |
| 389 'test_generators': [ | 384 'test_generators': [ |
| 390 steps.generate_gtest, | 385 steps.generate_gtest, |
| (...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 844 'src/third_party/WebKit/LayoutTests/OilpanExpectations', | 839 'src/third_party/WebKit/LayoutTests/OilpanExpectations', |
| 845 ]), | 840 ]), |
| 846 ], | 841 ], |
| 847 'testing': { | 842 'testing': { |
| 848 'platform': 'linux', | 843 'platform': 'linux', |
| 849 }, | 844 }, |
| 850 'enable_swarming': True, | 845 'enable_swarming': True, |
| 851 'use_isolate': True, | 846 'use_isolate': True, |
| 852 }, | 847 }, |
| 853 }) | 848 }) |
| OLD | NEW |