| 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 }, | 217 }, |
| 218 'WebKit Mac10.9': { | 218 'WebKit Mac10.9': { |
| 219 'chromium_config': 'chromium', | 219 'chromium_config': 'chromium', |
| 220 'chromium_apply_config': ['mb'], | 220 'chromium_apply_config': ['mb'], |
| 221 'gclient_config': 'chromium', | 221 'gclient_config': 'chromium', |
| 222 'gclient_apply_config': ['blink_or_chromium'], | 222 'gclient_apply_config': ['blink_or_chromium'], |
| 223 'chromium_config_kwargs': { | 223 'chromium_config_kwargs': { |
| 224 'BUILD_CONFIG': 'Release', | 224 'BUILD_CONFIG': 'Release', |
| 225 'TARGET_BITS': 64, | 225 'TARGET_BITS': 64, |
| 226 }, | 226 }, |
| 227 'bot_type': 'tester', | 227 'bot_type': 'builder', |
| 228 'parent_buildername': 'WebKit Mac Builder', | |
| 229 'test_generators': [ | 228 'test_generators': [ |
| 230 steps.generate_gtest, | 229 steps.generate_gtest, |
| 231 steps.generate_script, | 230 steps.generate_script, |
| 232 ], | 231 ], |
| 233 'tests': [ | 232 'tests': [ |
| 234 steps.BlinkTest(), | 233 steps.BlinkTest(), |
| 235 ], | 234 ], |
| 236 'testing': { | 235 'testing': { |
| 237 'platform': 'mac', | 236 'platform': 'mac', |
| 238 }, | 237 }, |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 '--options=--enable-leak-detection', | 541 '--options=--enable-leak-detection', |
| 543 ]), | 542 ]), |
| 544 ], | 543 ], |
| 545 'testing': { | 544 'testing': { |
| 546 'platform': 'linux', | 545 'platform': 'linux', |
| 547 }, | 546 }, |
| 548 'enable_swarming': True, | 547 'enable_swarming': True, |
| 549 'use_isolate': True, | 548 'use_isolate': True, |
| 550 }, | 549 }, |
| 551 }) | 550 }) |
| OLD | NEW |