| 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 from master import master_config | 5 from master import master_config |
| 6 from master.factory import chromium_factory | 6 from master.factory import chromium_factory |
| 7 | 7 |
| 8 import config | 8 import master_site_config |
| 9 | 9 |
| 10 ActiveMaster = config.Master.ChromiumWebkit | 10 ActiveMaster = master_site_config.ChromiumWebkit |
| 11 | 11 |
| 12 defaults = {} | 12 defaults = {} |
| 13 | 13 |
| 14 helper = master_config.Helper(defaults) | 14 helper = master_config.Helper(defaults) |
| 15 B = helper.Builder | 15 B = helper.Builder |
| 16 F = helper.Factory | 16 F = helper.Factory |
| 17 S = helper.Scheduler | 17 S = helper.Scheduler |
| 18 T = helper.Triggerable | 18 T = helper.Triggerable |
| 19 | 19 |
| 20 def win(): return chromium_factory.ChromiumFactory('src/out', 'win32') | 20 def win(): return chromium_factory.ChromiumFactory('src/out', 'win32') |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 tests=['webkit'], | 142 tests=['webkit'], |
| 143 factory_properties={ | 143 factory_properties={ |
| 144 'archive_webkit_results': ActiveMaster.is_production_host, | 144 'archive_webkit_results': ActiveMaster.is_production_host, |
| 145 'layout_part': '2:2', | 145 'layout_part': '2:2', |
| 146 'test_results_server': 'test-results.appspot.com', | 146 'test_results_server': 'test-results.appspot.com', |
| 147 'blink_config': 'blink', | 147 'blink_config': 'blink', |
| 148 })) | 148 })) |
| 149 | 149 |
| 150 def Update(_config, active_master, c): | 150 def Update(_config, active_master, c): |
| 151 return helper.Update(c) | 151 return helper.Update(c) |
| OLD | NEW |