| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 'browser_total_shards': 3, 'browser_shard_index': 1, | 119 'browser_total_shards': 3, 'browser_shard_index': 1, |
| 120 'start_crash_handler': True, | 120 'start_crash_handler': True, |
| 121 'generate_gtest_json': True})) | 121 'generate_gtest_json': True})) |
| 122 | 122 |
| 123 B('XP Tests (2)', 'rel_unit_2', 'testers|windows', 'win_rel_trigger', | 123 B('XP Tests (2)', 'rel_unit_2', 'testers|windows', 'win_rel_trigger', |
| 124 notify_on_missing=True) | 124 notify_on_missing=True) |
| 125 F('rel_unit_2', win_tester().ChromiumFactory( | 125 F('rel_unit_2', win_tester().ChromiumFactory( |
| 126 slave_type='Tester', | 126 slave_type='Tester', |
| 127 build_url=rel_archive, | 127 build_url=rel_archive, |
| 128 tests=[ | 128 tests=[ |
| 129 'ash_unittests', |
| 130 'aura', |
| 129 'base_unittests', | 131 'base_unittests', |
| 130 'browser_tests', | 132 'browser_tests', |
| 133 'compositor', |
| 131 'net', | 134 'net', |
| 132 'telemetry_unittests', | 135 'telemetry_unittests', |
| 136 'views_unittests', |
| 133 ], | 137 ], |
| 134 factory_properties={'process_dumps': True, | 138 factory_properties={'process_dumps': True, |
| 135 'sharded_tests': sharded_tests, | 139 'sharded_tests': sharded_tests, |
| 136 'browser_total_shards': 3, 'browser_shard_index': 2, | 140 'browser_total_shards': 3, 'browser_shard_index': 2, |
| 137 'start_crash_handler': True, | 141 'start_crash_handler': True, |
| 138 'generate_gtest_json': True})) | 142 'generate_gtest_json': True})) |
| 139 | 143 |
| 140 B('XP Tests (3)', 'rel_unit_3', 'testers|windows', 'win_rel_trigger', | 144 B('XP Tests (3)', 'rel_unit_3', 'testers|windows', 'win_rel_trigger', |
| 141 notify_on_missing=True) | 145 notify_on_missing=True) |
| 142 F('rel_unit_3', win_tester().ChromiumFactory( | 146 F('rel_unit_3', win_tester().ChromiumFactory( |
| (...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 600 ], | 604 ], |
| 601 factory_properties={ | 605 factory_properties={ |
| 602 'generate_gtest_json': True, | 606 'generate_gtest_json': True, |
| 603 'process_dumps': True, | 607 'process_dumps': True, |
| 604 'sharded_tests': sharded_tests, | 608 'sharded_tests': sharded_tests, |
| 605 'start_crash_handler': True, | 609 'start_crash_handler': True, |
| 606 })) | 610 })) |
| 607 | 611 |
| 608 def Update(config, active_master, c): | 612 def Update(config, active_master, c): |
| 609 return helper.Update(c) | 613 return helper.Update(c) |
| OLD | NEW |