| 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 defaults = {} | 8 defaults = {} |
| 9 | 9 |
| 10 helper = master_config.Helper(defaults) | 10 helper = master_config.Helper(defaults) |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 'browser_tests', | 24 'browser_tests', |
| 25 'cacheinvalidation_unittests', | 25 'cacheinvalidation_unittests', |
| 26 'cc_unittests', | 26 'cc_unittests', |
| 27 'chromedriver_tests', | 27 'chromedriver_tests', |
| 28 'chromedriver2_unittests', | 28 'chromedriver2_unittests', |
| 29 'components_unittests', | 29 'components_unittests', |
| 30 'content_browsertests', | 30 'content_browsertests', |
| 31 'content_unittests', | 31 'content_unittests', |
| 32 'crypto_unittests', | 32 'crypto_unittests', |
| 33 'device_unittests', | 33 'device_unittests', |
| 34 'events_unittests', |
| 34 'gpu_unittests', | 35 'gpu_unittests', |
| 35 'jingle_unittests', | 36 'jingle_unittests', |
| 36 'media_unittests', | 37 'media_unittests', |
| 37 'net_unittests', | 38 'net_unittests', |
| 38 'ppapi_unittests', | 39 'ppapi_unittests', |
| 39 'printing_unittests', | 40 'printing_unittests', |
| 40 'remoting_unittests', | 41 'remoting_unittests', |
| 41 # http://crbug.com/157234 | 42 # http://crbug.com/157234 |
| 42 #'sync_integration_tests', | 43 #'sync_integration_tests', |
| 43 'sync_unit_tests', | 44 'sync_unit_tests', |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 factory_properties={ | 140 factory_properties={ |
| 140 'sharded_tests': sharded_tests, | 141 'sharded_tests': sharded_tests, |
| 141 'start_crash_handler': True, | 142 'start_crash_handler': True, |
| 142 'generate_gtest_json': True, | 143 'generate_gtest_json': True, |
| 143 'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}, | 144 'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}, |
| 144 'blink_config': 'blink', | 145 'blink_config': 'blink', |
| 145 })) | 146 })) |
| 146 | 147 |
| 147 def Update(_config, _active_master, c): | 148 def Update(_config, _active_master, c): |
| 148 return helper.Update(c) | 149 return helper.Update(c) |
| OLD | NEW |