| 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 11 matching lines...) Expand all Loading... |
| 22 'src/build', 'win32', nohooks_on_update=True) | 22 'src/build', 'win32', nohooks_on_update=True) |
| 23 | 23 |
| 24 # Tests that are single-machine shard-safe. | 24 # Tests that are single-machine shard-safe. |
| 25 sharded_tests = [ | 25 sharded_tests = [ |
| 26 'aura_unittests', | 26 'aura_unittests', |
| 27 'base_unittests', | 27 'base_unittests', |
| 28 'browser_tests', | 28 'browser_tests', |
| 29 'cacheinvalidation_unittests', | 29 'cacheinvalidation_unittests', |
| 30 'cc_unittests', | 30 'cc_unittests', |
| 31 'chromedriver_tests', | 31 'chromedriver_tests', |
| 32 'chromedriver_unittests', |
| 32 'chromedriver2_unittests', | 33 'chromedriver2_unittests', |
| 33 'components_unittests', | 34 'components_unittests', |
| 34 'content_browsertests', | 35 'content_browsertests', |
| 35 'content_unittests', | 36 'content_unittests', |
| 36 'crypto_unittests', | 37 'crypto_unittests', |
| 37 'device_unittests', | 38 'device_unittests', |
| 38 'events_unittests', | 39 'events_unittests', |
| 39 'google_apis_unittests', | 40 'google_apis_unittests', |
| 40 'gpu_unittests', | 41 'gpu_unittests', |
| 41 'jingle_unittests', | 42 'jingle_unittests', |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 # | 94 # |
| 94 B('XP Tests (1)', 'rel_unit_1', 'testers|windows', 'win_rel_trigger', | 95 B('XP Tests (1)', 'rel_unit_1', 'testers|windows', 'win_rel_trigger', |
| 95 notify_on_missing=True) | 96 notify_on_missing=True) |
| 96 F('rel_unit_1', win_tester().ChromiumFactory( | 97 F('rel_unit_1', win_tester().ChromiumFactory( |
| 97 slave_type='Tester', | 98 slave_type='Tester', |
| 98 build_url=rel_archive, | 99 build_url=rel_archive, |
| 99 tests=[ | 100 tests=[ |
| 100 'browser_tests', | 101 'browser_tests', |
| 101 'cacheinvalidation_unittests', | 102 'cacheinvalidation_unittests', |
| 102 'cc_unittests', | 103 'cc_unittests', |
| 104 'chromedriver_unittests', |
| 103 'chromedriver2_unittests', | 105 'chromedriver2_unittests', |
| 104 'content_browsertests', | 106 'content_browsertests', |
| 105 'courgette_unittests', | 107 'courgette_unittests', |
| 106 'crypto_unittests', | 108 'crypto_unittests', |
| 107 'googleurl', | 109 'googleurl', |
| 108 'gpu', | 110 'gpu', |
| 109 'installer', | 111 'installer', |
| 110 'interactive_ui_tests', | 112 'interactive_ui_tests', |
| 111 'jingle', | 113 'jingle', |
| 112 'media', | 114 'media', |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 B('Win 7 Tests x64 (1)', 'rel_x64_unit_1', 'windows', | 217 B('Win 7 Tests x64 (1)', 'rel_x64_unit_1', 'windows', |
| 216 'win_x64_rel_trigger', notify_on_missing=True) | 218 'win_x64_rel_trigger', notify_on_missing=True) |
| 217 F('rel_x64_unit_1', win_tester().ChromiumFactory( | 219 F('rel_x64_unit_1', win_tester().ChromiumFactory( |
| 218 slave_type='Tester', | 220 slave_type='Tester', |
| 219 target='Release_x64', | 221 target='Release_x64', |
| 220 build_url=rel_x64_archive, | 222 build_url=rel_x64_archive, |
| 221 tests=[ | 223 tests=[ |
| 222 'browser_tests', | 224 'browser_tests', |
| 223 'cacheinvalidation_unittests', | 225 'cacheinvalidation_unittests', |
| 224 'cc_unittests', | 226 'cc_unittests', |
| 227 'chromedriver_unittests', |
| 225 'chromedriver2_unittests', | 228 'chromedriver2_unittests', |
| 226 'content_browsertests', | 229 'content_browsertests', |
| 227 'courgette_unittests', | 230 'courgette_unittests', |
| 228 'crypto_unittests', | 231 'crypto_unittests', |
| 229 'google_apis_unittests', | 232 'google_apis_unittests', |
| 230 'gpu_unittests', | 233 'gpu_unittests', |
| 231 'installer_util_unittests', | 234 'installer_util_unittests', |
| 232 'interactive_ui_tests', | 235 'interactive_ui_tests', |
| 233 'jingle_unittests', | 236 'jingle_unittests', |
| 234 'media_unittests', | 237 'media_unittests', |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 F('dbg_unit_1', win_tester().ChromiumFactory( | 394 F('dbg_unit_1', win_tester().ChromiumFactory( |
| 392 target='Debug', | 395 target='Debug', |
| 393 slave_type='Tester', | 396 slave_type='Tester', |
| 394 build_url=dbg_archive, | 397 build_url=dbg_archive, |
| 395 tests=[ | 398 tests=[ |
| 396 'ash_unittests', | 399 'ash_unittests', |
| 397 'aura', | 400 'aura', |
| 398 'base_unittests', | 401 'base_unittests', |
| 399 'cacheinvalidation_unittests', | 402 'cacheinvalidation_unittests', |
| 400 'cc_unittests', | 403 'cc_unittests', |
| 404 'chromedriver_unittests', |
| 401 'chromedriver2_unittests', | 405 'chromedriver2_unittests', |
| 402 'check_deps', | 406 'check_deps', |
| 403 'components_unittests', | 407 'components_unittests', |
| 404 'compositor', | 408 'compositor', |
| 405 'courgette_unittests', | 409 'courgette_unittests', |
| 406 'crypto_unittests', | 410 'crypto_unittests', |
| 407 'events', | 411 'events', |
| 408 'googleurl', | 412 'googleurl', |
| 409 'gpu', | 413 'gpu', |
| 410 'installer', | 414 'installer', |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 531 ], | 535 ], |
| 532 factory_properties={ | 536 factory_properties={ |
| 533 'generate_gtest_json': True, | 537 'generate_gtest_json': True, |
| 534 'process_dumps': True, | 538 'process_dumps': True, |
| 535 'sharded_tests': sharded_tests, | 539 'sharded_tests': sharded_tests, |
| 536 'start_crash_handler': True, | 540 'start_crash_handler': True, |
| 537 })) | 541 })) |
| 538 | 542 |
| 539 def Update(config, active_master, c): | 543 def Update(config, active_master, c): |
| 540 return helper.Update(c) | 544 return helper.Update(c) |
| OLD | NEW |