| 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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 steps.BlinkTest(), | 284 steps.BlinkTest(), |
| 285 ], | 285 ], |
| 286 'testing': { | 286 'testing': { |
| 287 'platform': 'mac', | 287 'platform': 'mac', |
| 288 }, | 288 }, |
| 289 'enable_swarming': True, | 289 'enable_swarming': True, |
| 290 'use_isolate': True, | 290 'use_isolate': True, |
| 291 }, | 291 }, |
| 292 'WebKit Mac10.9 (retina)': { | 292 'WebKit Mac10.9 (retina)': { |
| 293 'chromium_config': 'chromium', | 293 'chromium_config': 'chromium', |
| 294 'chromium_apply_config': ['chromium_mac_sdk_10_6'], | |
| 295 'gclient_config': 'chromium', | 294 'gclient_config': 'chromium', |
| 296 'gclient_apply_config': ['blink_or_chromium'], | 295 'gclient_apply_config': ['blink_or_chromium'], |
| 297 'chromium_config_kwargs': { | 296 'chromium_config_kwargs': { |
| 298 'BUILD_CONFIG': 'Release', | 297 'BUILD_CONFIG': 'Release', |
| 299 'TARGET_BITS': 64, | 298 'TARGET_BITS': 64, |
| 300 }, | 299 }, |
| 301 'compile_targets': [ | 300 'compile_targets': [ |
| 302 'blink_tests', | 301 'blink_tests', |
| 303 ], | 302 ], |
| 304 'test_generators': [ | 303 'test_generators': [ |
| (...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 869 'src/third_party/WebKit/LayoutTests/OilpanExpectations', | 868 'src/third_party/WebKit/LayoutTests/OilpanExpectations', |
| 870 ]), | 869 ]), |
| 871 ], | 870 ], |
| 872 'testing': { | 871 'testing': { |
| 873 'platform': 'linux', | 872 'platform': 'linux', |
| 874 }, | 873 }, |
| 875 'enable_swarming': True, | 874 'enable_swarming': True, |
| 876 'use_isolate': True, | 875 'use_isolate': True, |
| 877 }, | 876 }, |
| 878 }) | 877 }) |
| OLD | NEW |