| 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 'start_crash_handler': True, | 237 'start_crash_handler': True, |
| 238 'generate_gtest_json': True})) | 238 'generate_gtest_json': True})) |
| 239 | 239 |
| 240 B('Win 7 Tests x64 (2)', 'rel_x64_unit_2', 'windows', | 240 B('Win 7 Tests x64 (2)', 'rel_x64_unit_2', 'windows', |
| 241 'win_x64_rel_trigger', notify_on_missing=True) | 241 'win_x64_rel_trigger', notify_on_missing=True) |
| 242 F('rel_x64_unit_2', win_tester().ChromiumFactory( | 242 F('rel_x64_unit_2', win_tester().ChromiumFactory( |
| 243 slave_type='Tester', | 243 slave_type='Tester', |
| 244 target='Release_x64', | 244 target='Release_x64', |
| 245 build_url=rel_x64_archive, | 245 build_url=rel_x64_archive, |
| 246 tests=[ | 246 tests=[ |
| 247 'app_list_unittests', |
| 247 'base_unittests', | 248 'base_unittests', |
| 248 'browser_tests', | 249 'browser_tests', |
| 249 'net_unittests', | 250 'net_unittests', |
| 250 ], | 251 ], |
| 251 factory_properties={'process_dumps': True, | 252 factory_properties={'process_dumps': True, |
| 252 'sharded_tests': sharded_tests, | 253 'sharded_tests': sharded_tests, |
| 253 'browser_total_shards': 3, 'browser_shard_index': 2, | 254 'browser_total_shards': 3, 'browser_shard_index': 2, |
| 254 'start_crash_handler': True, | 255 'start_crash_handler': True, |
| 255 'generate_gtest_json': True})) | 256 'generate_gtest_json': True})) |
| 256 | 257 |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 ], | 600 ], |
| 600 factory_properties={ | 601 factory_properties={ |
| 601 'generate_gtest_json': True, | 602 'generate_gtest_json': True, |
| 602 'process_dumps': True, | 603 'process_dumps': True, |
| 603 'sharded_tests': sharded_tests, | 604 'sharded_tests': sharded_tests, |
| 604 'start_crash_handler': True, | 605 'start_crash_handler': True, |
| 605 })) | 606 })) |
| 606 | 607 |
| 607 def Update(config, active_master, c): | 608 def Update(config, active_master, c): |
| 608 return helper.Update(c) | 609 return helper.Update(c) |
| OLD | NEW |