| 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 | 17 |
| 18 def linux(): | 18 def linux(): |
| 19 return chromium_factory.ChromiumFactory('src/out', 'linux2') | 19 return chromium_factory.ChromiumFactory('src/out', 'linux2') |
| 20 | 20 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 49 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], | 49 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], |
| 50 ], | 50 ], |
| 51 'archive_webkit_results': ActiveMaster.is_production_host, | 51 'archive_webkit_results': ActiveMaster.is_production_host, |
| 52 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, | 52 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, |
| 53 'generate_gtest_json': True, | 53 'generate_gtest_json': True, |
| 54 'test_results_server': 'test-results.appspot.com', | 54 'test_results_server': 'test-results.appspot.com', |
| 55 })) | 55 })) |
| 56 | 56 |
| 57 def Update(_config, _active_master, c): | 57 def Update(_config, _active_master, c): |
| 58 return helper.Update(c) | 58 return helper.Update(c) |
| OLD | NEW |