| 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 18 matching lines...) Expand all Loading... |
| 29 'cacheinvalidation_unittests', | 29 'cacheinvalidation_unittests', |
| 30 'cc_unittests', | 30 'cc_unittests', |
| 31 'chromedriver_tests', | 31 'chromedriver_tests', |
| 32 'chromedriver2_unittests', | 32 'chromedriver2_unittests', |
| 33 'components_unittests', | 33 'components_unittests', |
| 34 'content_browsertests', | 34 'content_browsertests', |
| 35 'content_unittests', | 35 'content_unittests', |
| 36 'crypto_unittests', | 36 'crypto_unittests', |
| 37 'device_unittests', | 37 'device_unittests', |
| 38 'events_unittests', | 38 'events_unittests', |
| 39 'google_apis_unittests', |
| 39 'gpu_unittests', | 40 'gpu_unittests', |
| 40 'jingle_unittests', | 41 'jingle_unittests', |
| 41 'media_unittests', | 42 'media_unittests', |
| 42 'net_unittests', | 43 'net_unittests', |
| 43 'ppapi_unittests', | 44 'ppapi_unittests', |
| 44 'printing_unittests', | 45 'printing_unittests', |
| 45 'remoting_unittests', | 46 'remoting_unittests', |
| 46 # http://crbug.com/157234 | 47 # http://crbug.com/157234 |
| 47 #'sync_integration_tests', | 48 #'sync_integration_tests', |
| 48 'sync_unit_tests', | 49 'sync_unit_tests', |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 'generate_gtest_json': True})) | 145 'generate_gtest_json': True})) |
| 145 | 146 |
| 146 B('XP Tests (3)', 'rel_unit_3', 'testers|windows', 'win_rel_trigger', | 147 B('XP Tests (3)', 'rel_unit_3', 'testers|windows', 'win_rel_trigger', |
| 147 notify_on_missing=True) | 148 notify_on_missing=True) |
| 148 F('rel_unit_3', win_tester().ChromiumFactory( | 149 F('rel_unit_3', win_tester().ChromiumFactory( |
| 149 slave_type='Tester', | 150 slave_type='Tester', |
| 150 build_url=rel_archive, | 151 build_url=rel_archive, |
| 151 tests=[ | 152 tests=[ |
| 152 'browser_tests', | 153 'browser_tests', |
| 153 'components_unittests', | 154 'components_unittests', |
| 155 'google_apis_unittests', |
| 154 'unit', | 156 'unit', |
| 155 ], | 157 ], |
| 156 factory_properties={'process_dumps': True, | 158 factory_properties={'process_dumps': True, |
| 157 'sharded_tests': sharded_tests, | 159 'sharded_tests': sharded_tests, |
| 158 'browser_total_shards': 3, 'browser_shard_index': 3, | 160 'browser_total_shards': 3, 'browser_shard_index': 3, |
| 159 'start_crash_handler': True, | 161 'start_crash_handler': True, |
| 160 'generate_gtest_json': True})) | 162 'generate_gtest_json': True})) |
| 161 | 163 |
| 162 B('Vista Tests (1)', 'rel_unit_1', 'testers|windows', 'win_rel_trigger', | 164 B('Vista Tests (1)', 'rel_unit_1', 'testers|windows', 'win_rel_trigger', |
| 163 notify_on_missing=True) | 165 notify_on_missing=True) |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 target='Release_x64', | 219 target='Release_x64', |
| 218 build_url=rel_x64_archive, | 220 build_url=rel_x64_archive, |
| 219 tests=[ | 221 tests=[ |
| 220 'browser_tests', | 222 'browser_tests', |
| 221 'cacheinvalidation_unittests', | 223 'cacheinvalidation_unittests', |
| 222 'cc_unittests', | 224 'cc_unittests', |
| 223 'chromedriver2_unittests', | 225 'chromedriver2_unittests', |
| 224 'content_browsertests', | 226 'content_browsertests', |
| 225 'courgette_unittests', | 227 'courgette_unittests', |
| 226 'crypto_unittests', | 228 'crypto_unittests', |
| 229 'google_apis_unittests', |
| 227 'gpu_unittests', | 230 'gpu_unittests', |
| 228 'installer_util_unittests', | 231 'installer_util_unittests', |
| 229 'interactive_ui_tests', | 232 'interactive_ui_tests', |
| 230 'jingle_unittests', | 233 'jingle_unittests', |
| 231 'media_unittests', | 234 'media_unittests', |
| 232 'ppapi_unittests', | 235 'ppapi_unittests', |
| 233 'printing_unittests', | 236 'printing_unittests', |
| 234 'remoting_unittests', | 237 'remoting_unittests', |
| 235 'sbox_integration_tests', | 238 'sbox_integration_tests', |
| 236 'sbox_unittests', | 239 'sbox_unittests', |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 ], | 531 ], |
| 529 factory_properties={ | 532 factory_properties={ |
| 530 'generate_gtest_json': True, | 533 'generate_gtest_json': True, |
| 531 'process_dumps': True, | 534 'process_dumps': True, |
| 532 'sharded_tests': sharded_tests, | 535 'sharded_tests': sharded_tests, |
| 533 'start_crash_handler': True, | 536 'start_crash_handler': True, |
| 534 })) | 537 })) |
| 535 | 538 |
| 536 def Update(config, active_master, c): | 539 def Update(config, active_master, c): |
| 537 return helper.Update(c) | 540 return helper.Update(c) |
| OLD | NEW |