| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 | 5 |
| 6 from master import master_config | 6 from master import master_config |
| 7 from master.factory import chromium_factory | 7 from master.factory import chromium_factory |
| 8 | 8 |
| 9 import config | 9 import config |
| 10 | 10 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 S('s2_contentshell_webkit_rel', branch='trunk', treeStableTimer=60) | 32 S('s2_contentshell_webkit_rel', branch='trunk', treeStableTimer=60) |
| 33 | 33 |
| 34 # | 34 # |
| 35 # Content Shell Layouttests | 35 # Content Shell Layouttests |
| 36 # | 36 # |
| 37 | 37 |
| 38 B('WebKit (Content Shell) Mac10.6', | 38 B('WebKit (Content Shell) Mac10.6', |
| 39 'f_contentshell_mac_rel', | 39 'f_contentshell_mac_rel', |
| 40 scheduler='s2_contentshell_webkit_rel') | 40 scheduler='s2_contentshell_webkit_rel') |
| 41 | 41 |
| 42 F('f_contentshell_mac_rel', mac().ChromiumWebkitLatestFactory( | 42 F('f_contentshell_mac_rel', mac().ChromiumFactory( |
| 43 target='Release', | 43 target='Release', |
| 44 tests=[ | 44 tests=[ |
| 45 'webkit', | 45 'webkit', |
| 46 ], | 46 ], |
| 47 options=[ | 47 options=[ |
| 48 '--build-tool=ninja', | 48 '--build-tool=ninja', |
| 49 '--compiler=goma-clang', | 49 '--compiler=goma-clang', |
| 50 'content_shell_builder', | 50 'content_shell_builder', |
| 51 ], | 51 ], |
| 52 factory_properties={ | 52 factory_properties={ |
| 53 'additional_drt_flag': '--dump-render-tree', | 53 'additional_drt_flag': '--dump-render-tree', |
| 54 'additional_expectations': [ | 54 'additional_expectations': [ |
| 55 [ 'third_party', | 55 [ 'third_party', |
| 56 'WebKit', | 56 'WebKit', |
| 57 'LayoutTests', | 57 'LayoutTests', |
| 58 'platform', | 58 'platform', |
| 59 'chromium', | 59 'chromium', |
| 60 'ContentShellTestExpectations' ], | 60 'ContentShellTestExpectations' ], |
| 61 ], | 61 ], |
| 62 'archive_webkit_results': ActiveMaster.is_production_host, | 62 'archive_webkit_results': ActiveMaster.is_production_host, |
| 63 'driver_name': 'Content Shell', | 63 'driver_name': 'Content Shell', |
| 64 'gclient_env': { | 64 'gclient_env': { |
| 65 'GYP_GENERATORS':'ninja', | 65 'GYP_GENERATORS':'ninja', |
| 66 'GYP_DEFINES':'fastbuild=1', | 66 'GYP_DEFINES':'fastbuild=1', |
| 67 }, | 67 }, |
| 68 'test_results_server': 'test-results.appspot.com', | 68 'test_results_server': 'test-results.appspot.com', |
| 69 'blink_config': 'blink', |
| 69 })) | 70 })) |
| 70 | 71 |
| 71 | 72 |
| 72 def Update(_config, active_master, c): | 73 def Update(_config, active_master, c): |
| 73 return helper.Update(c) | 74 return helper.Update(c) |
| OLD | NEW |