| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2010 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 slave_type='Builder')) | 46 slave_type='Builder')) |
| 47 | 47 |
| 48 # | 48 # |
| 49 # Win Rel Webkit testers | 49 # Win Rel Webkit testers |
| 50 # | 50 # |
| 51 B('Webkit Win', 'webkit_rel_tests', 'testers', 'webkit_win_rel_dep') | 51 B('Webkit Win', 'webkit_rel_tests', 'testers', 'webkit_win_rel_dep') |
| 52 F('webkit_rel_tests', win().ChromiumFactory( | 52 F('webkit_rel_tests', win().ChromiumFactory( |
| 53 'webkit-win-rel', | 53 'webkit-win-rel', |
| 54 slave_type='Tester', | 54 slave_type='Tester', |
| 55 build_url=rel_archive, | 55 build_url=rel_archive, |
| 56 tests=['test_shell', 'webkit', 'webkit_unit'], | 56 tests=['test_shell', 'webkit', 'webkit_gpu', 'webkit_unit'], |
| 57 factory_properties={'archive_webkit_results': True, | 57 factory_properties={'archive_webkit_results': True, |
| 58 'test_results_server': 'test-results.appspot.com'})) | 58 'test_results_server': 'test-results.appspot.com'})) |
| 59 | 59 |
| 60 ################################################################################ | 60 ################################################################################ |
| 61 ## Debug | 61 ## Debug |
| 62 ################################################################################ | 62 ################################################################################ |
| 63 | 63 |
| 64 dbg_archive = master_config.GetArchiveUrl('Chromium', | 64 dbg_archive = master_config.GetArchiveUrl('Chromium', |
| 65 'Webkit Win Builder (dbg)', | 65 'Webkit Win Builder (dbg)', |
| 66 'webkit-win-dbg', 'win32') | 66 'webkit-win-dbg', 'win32') |
| (...skipping 21 matching lines...) Expand all Loading... |
| 88 # | 88 # |
| 89 # Win Dbg Webkit testers. | 89 # Win Dbg Webkit testers. |
| 90 # | 90 # |
| 91 | 91 |
| 92 B('Webkit Win (dbg)(1)', 'webkit_dbg_tests_1', 'testers', 'webkit_win_rel_dep') | 92 B('Webkit Win (dbg)(1)', 'webkit_dbg_tests_1', 'testers', 'webkit_win_rel_dep') |
| 93 F('webkit_dbg_tests_1', win().ChromiumFactory( | 93 F('webkit_dbg_tests_1', win().ChromiumFactory( |
| 94 'webkit-win-dbg', | 94 'webkit-win-dbg', |
| 95 slave_type='Tester', | 95 slave_type='Tester', |
| 96 target='Debug', | 96 target='Debug', |
| 97 build_url=dbg_archive, | 97 build_url=dbg_archive, |
| 98 tests=['webkit', 'test_shell', 'webkit_unit'], | 98 tests=['webkit', 'webkit_gpu', 'test_shell', 'webkit_unit'], |
| 99 factory_properties={'archive_webkit_results': True, | 99 factory_properties={'archive_webkit_results': True, |
| 100 'test_results_server': 'test-results.appspot.com', | 100 'test_results_server': 'test-results.appspot.com', |
| 101 'layout_part': '1:3'})) | 101 'layout_part': '1:3'})) |
| 102 | 102 |
| 103 B('Webkit Win (dbg)(2)', 'webkit_dbg_tests_2', 'testers', 'webkit_win_rel_dep') | 103 B('Webkit Win (dbg)(2)', 'webkit_dbg_tests_2', 'testers', 'webkit_win_rel_dep') |
| 104 F('webkit_dbg_tests_2', win().ChromiumFactory( | 104 F('webkit_dbg_tests_2', win().ChromiumFactory( |
| 105 'webkit-win-dbg', | 105 'webkit-win-dbg', |
| 106 slave_type='Tester', | 106 slave_type='Tester', |
| 107 target='Debug', | 107 target='Debug', |
| 108 build_url=dbg_archive, | 108 build_url=dbg_archive, |
| 109 tests=['webkit'], | 109 tests=['webkit', 'webkit_gpu'], |
| 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': '2:3'})) | 112 'layout_part': '2:3'})) |
| 113 | 113 |
| 114 B('Webkit Win (dbg)(3)', 'webkit_dbg_tests_3', 'testers', 'webkit_win_rel_dep') | 114 B('Webkit Win (dbg)(3)', 'webkit_dbg_tests_3', 'testers', 'webkit_win_rel_dep') |
| 115 F('webkit_dbg_tests_3', win().ChromiumFactory( | 115 F('webkit_dbg_tests_3', win().ChromiumFactory( |
| 116 'webkit-win-dbg', | 116 'webkit-win-dbg', |
| 117 slave_type='Tester', | 117 slave_type='Tester', |
| 118 target='Debug', | 118 target='Debug', |
| 119 build_url=dbg_archive, | 119 build_url=dbg_archive, |
| 120 tests=['webkit'], | 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': '3:3'})) | 123 'layout_part': '3:3'})) |
| 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 |