| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 })) | 48 })) |
| 49 | 49 |
| 50 # | 50 # |
| 51 # Win Rel Webkit testers | 51 # Win Rel Webkit testers |
| 52 # | 52 # |
| 53 B('Webkit Win', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger', | 53 B('Webkit Win', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger', |
| 54 auto_reboot=True) | 54 auto_reboot=True) |
| 55 F('f_webkit_rel_tests', win().ChromiumWebkitLatestFactory( | 55 F('f_webkit_rel_tests', win().ChromiumWebkitLatestFactory( |
| 56 slave_type='Tester', | 56 slave_type='Tester', |
| 57 build_url=rel_archive, | 57 build_url=rel_archive, |
| 58 tests=['test_shell', 'webkit', 'webkit_gpu', 'webkit_unit'], | 58 tests=['test_shell', 'webkit_lint', 'webkit', 'webkit_gpu', 'webkit_unit'], |
| 59 factory_properties={'archive_webkit_results': True, | 59 factory_properties={'archive_webkit_results': True, |
| 60 'test_results_server': 'test-results.appspot.com'})) | 60 'test_results_server': 'test-results.appspot.com'})) |
| 61 | 61 |
| 62 B('Webkit Vista', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger', | 62 B('Webkit Vista', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger', |
| 63 auto_reboot=True) | 63 auto_reboot=True) |
| 64 | 64 |
| 65 B('Webkit Win7', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger', | 65 B('Webkit Win7', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger', |
| 66 auto_reboot=True) | 66 auto_reboot=True) |
| 67 | 67 |
| 68 ################################################################################ | 68 ################################################################################ |
| (...skipping 30 matching lines...) Expand all Loading... |
| 99 # | 99 # |
| 100 # Win Dbg Webkit testers | 100 # Win Dbg Webkit testers |
| 101 # | 101 # |
| 102 | 102 |
| 103 B('Webkit Win (dbg)(1)', 'f_webkit_dbg_tests_1', | 103 B('Webkit Win (dbg)(1)', 'f_webkit_dbg_tests_1', |
| 104 scheduler='s4_webkit_dbg_trigger', auto_reboot=True) | 104 scheduler='s4_webkit_dbg_trigger', auto_reboot=True) |
| 105 F('f_webkit_dbg_tests_1', win().ChromiumWebkitLatestFactory( | 105 F('f_webkit_dbg_tests_1', win().ChromiumWebkitLatestFactory( |
| 106 target='Debug', | 106 target='Debug', |
| 107 slave_type='Tester', | 107 slave_type='Tester', |
| 108 build_url=dbg_archive, | 108 build_url=dbg_archive, |
| 109 tests=['test_shell', 'webkit', 'webkit_gpu', 'webkit_unit'], | 109 tests=['test_shell', 'webkit_lint', 'webkit', 'webkit_gpu', 'webkit_unit'], |
| 110 factory_properties={'archive_webkit_results': True, | 110 factory_properties={'archive_webkit_results': True, |
| 111 'test_results_server': 'test-results.appspot.com', | 111 'test_results_server': 'test-results.appspot.com', |
| 112 'layout_part': '1:2'})) | 112 'layout_part': '1:2'})) |
| 113 | 113 |
| 114 B('Webkit Win (dbg)(2)', 'f_webkit_dbg_tests_2', | 114 B('Webkit Win (dbg)(2)', 'f_webkit_dbg_tests_2', |
| 115 scheduler='s4_webkit_dbg_trigger', auto_reboot=True) | 115 scheduler='s4_webkit_dbg_trigger', auto_reboot=True) |
| 116 F('f_webkit_dbg_tests_2', win().ChromiumWebkitLatestFactory( | 116 F('f_webkit_dbg_tests_2', win().ChromiumWebkitLatestFactory( |
| 117 target='Debug', | 117 target='Debug', |
| 118 slave_type='Tester', | 118 slave_type='Tester', |
| 119 build_url=dbg_archive, | 119 build_url=dbg_archive, |
| 120 tests=['webkit', 'webkit_gpu'], | 120 tests=['webkit', 'webkit_gpu'], |
| 121 factory_properties={'archive_webkit_results': True, | 121 factory_properties={'archive_webkit_results': True, |
| 122 'test_results_server': 'test-results.appspot.com', | 122 'test_results_server': 'test-results.appspot.com', |
| 123 'layout_part': '2:2'})) | 123 'layout_part': '2:2'})) |
| 124 | 124 |
| 125 def Update(config, active_master, c): | 125 def Update(config, active_master, c): |
| 126 return helper.Update(c) | 126 return helper.Update(c) |
| OLD | NEW |