| 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 # WebKit test builders using the Skia graphics library. | 5 # WebKit test builders using the Skia graphics library. |
| 6 | 6 |
| 7 from master import master_config | 7 from master import master_config |
| 8 from master.factory import chromium_factory | 8 from master.factory import chromium_factory |
| 9 | 9 |
| 10 import config | 10 import master_site_config |
| 11 | 11 |
| 12 ActiveMaster = config.Master.ChromiumWebkit | 12 ActiveMaster = master_site_config.ChromiumWebkit |
| 13 | 13 |
| 14 defaults = {} | 14 defaults = {} |
| 15 | 15 |
| 16 helper = master_config.Helper(defaults) | 16 helper = master_config.Helper(defaults) |
| 17 B = helper.Builder | 17 B = helper.Builder |
| 18 D = helper.Dependent | 18 D = helper.Dependent |
| 19 F = helper.Factory | 19 F = helper.Factory |
| 20 S = helper.Scheduler | 20 S = helper.Scheduler |
| 21 | 21 |
| 22 def mac(): return chromium_factory.ChromiumFactory('src/xcodebuild', 'darwin') | 22 def mac(): return chromium_factory.ChromiumFactory('src/xcodebuild', 'darwin') |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 'layout_test_platform': 'chromium-mac', | 83 'layout_test_platform': 'chromium-mac', |
| 84 'test_results_server': 'test-results.appspot.com', | 84 'test_results_server': 'test-results.appspot.com', |
| 85 })) | 85 })) |
| 86 | 86 |
| 87 ################################################################################ | 87 ################################################################################ |
| 88 ## | 88 ## |
| 89 ################################################################################ | 89 ################################################################################ |
| 90 | 90 |
| 91 def Update(_config, active_master, c): | 91 def Update(_config, active_master, c): |
| 92 return helper.Update(c) | 92 return helper.Update(c) |
| OLD | NEW |