| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 options=['--', '-project', '../webkit/webkit.xcodeproj'])) | 47 options=['--', '-project', '../webkit/webkit.xcodeproj'])) |
| 48 | 48 |
| 49 # | 49 # |
| 50 # Mac Rel Webkit testers | 50 # Mac Rel Webkit testers |
| 51 # | 51 # |
| 52 B('Webkit Mac10.5', 'webkit_rel_tests', 'testers', 'webkit_mac_rel_dep') | 52 B('Webkit Mac10.5', 'webkit_rel_tests', 'testers', 'webkit_mac_rel_dep') |
| 53 F('webkit_rel_tests', mac().ChromiumFactory( | 53 F('webkit_rel_tests', mac().ChromiumFactory( |
| 54 'webkit-mac-rel', | 54 'webkit-mac-rel', |
| 55 slave_type='Tester', | 55 slave_type='Tester', |
| 56 build_url=rel_archive, | 56 build_url=rel_archive, |
| 57 tests=['test_shell', 'webkit', 'webkit_unit'], | 57 tests=['test_shell', 'webkit', 'webkit_gpu', 'webkit_unit'], |
| 58 factory_properties={'archive_webkit_results': True, | 58 factory_properties={'archive_webkit_results': True, |
| 59 'test_results_server': 'test-results.appspot.com'})) | 59 'test_results_server': 'test-results.appspot.com'})) |
| 60 | 60 |
| 61 ################################################################################ | 61 ################################################################################ |
| 62 ## Debug | 62 ## Debug |
| 63 ################################################################################ | 63 ################################################################################ |
| 64 | 64 |
| 65 dbg_archive = master_config.GetArchiveUrl('Chromium', | 65 dbg_archive = master_config.GetArchiveUrl('Chromium', |
| 66 'Webkit Mac Builder (dbg)', | 66 'Webkit Mac Builder (dbg)', |
| 67 'webkit-mac-dbg', 'mac') | 67 'webkit-mac-dbg', 'mac') |
| (...skipping 23 matching lines...) Expand all Loading... |
| 91 # Mac Dbg Webkit testers | 91 # Mac Dbg Webkit testers |
| 92 # | 92 # |
| 93 | 93 |
| 94 B('Webkit Mac10.5 (dbg)(1)', 'webkit_dbg_tests_1', 'testers', | 94 B('Webkit Mac10.5 (dbg)(1)', 'webkit_dbg_tests_1', 'testers', |
| 95 'webkit_mac_rel_dep') | 95 'webkit_mac_rel_dep') |
| 96 F('webkit_dbg_tests_1', mac().ChromiumFactory( | 96 F('webkit_dbg_tests_1', mac().ChromiumFactory( |
| 97 'webkit-mac-dbg', | 97 'webkit-mac-dbg', |
| 98 slave_type='Tester', | 98 slave_type='Tester', |
| 99 target='Debug', | 99 target='Debug', |
| 100 build_url=dbg_archive, | 100 build_url=dbg_archive, |
| 101 tests=['webkit'], | 101 tests=['webkit', 'webkit_gpu'], |
| 102 factory_properties={'archive_webkit_results': True, | 102 factory_properties={'archive_webkit_results': True, |
| 103 'test_results_server': 'test-results.appspot.com', | 103 'test_results_server': 'test-results.appspot.com', |
| 104 'layout_part': '1:3'})) | 104 'layout_part': '1:3'})) |
| 105 | 105 |
| 106 B('Webkit Mac10.5 (dbg)(2)', 'webkit_dbg_tests_2', 'testers', | 106 B('Webkit Mac10.5 (dbg)(2)', 'webkit_dbg_tests_2', 'testers', |
| 107 'webkit_mac_rel_dep') | 107 'webkit_mac_rel_dep') |
| 108 F('webkit_dbg_tests_2', mac().ChromiumFactory( | 108 F('webkit_dbg_tests_2', mac().ChromiumFactory( |
| 109 'webkit-mac-dbg', | 109 'webkit-mac-dbg', |
| 110 slave_type='Tester', | 110 slave_type='Tester', |
| 111 target='Debug', | 111 target='Debug', |
| 112 build_url=dbg_archive, | 112 build_url=dbg_archive, |
| 113 tests=['webkit'], | 113 tests=['webkit', 'webkit_gpu'], |
| 114 factory_properties={'archive_webkit_results': True, | 114 factory_properties={'archive_webkit_results': True, |
| 115 'test_results_server': 'test-results.appspot.com', | 115 'test_results_server': 'test-results.appspot.com', |
| 116 'layout_part': '2:3'})) | 116 'layout_part': '2:3'})) |
| 117 | 117 |
| 118 B('Webkit Mac10.5 (dbg)(3)', 'webkit_dbg_tests_3', 'testers', | 118 B('Webkit Mac10.5 (dbg)(3)', 'webkit_dbg_tests_3', 'testers', |
| 119 'webkit_mac_rel_dep') | 119 'webkit_mac_rel_dep') |
| 120 F('webkit_dbg_tests_3', mac().ChromiumFactory( | 120 F('webkit_dbg_tests_3', mac().ChromiumFactory( |
| 121 'webkit-mac-dbg', | 121 'webkit-mac-dbg', |
| 122 slave_type='Tester', | 122 slave_type='Tester', |
| 123 target='Debug', | 123 target='Debug', |
| 124 build_url=dbg_archive, | 124 build_url=dbg_archive, |
| 125 tests=['test_shell', 'webkit', 'webkit_unit'], | 125 tests=['test_shell', 'webkit', 'webkit_gpu', 'webkit_unit'], |
| 126 factory_properties={'archive_webkit_results': True, | 126 factory_properties={'archive_webkit_results': True, |
| 127 'test_results_server': 'test-results.appspot.com', | 127 'test_results_server': 'test-results.appspot.com', |
| 128 'layout_part': '3:3'})) | 128 'layout_part': '3:3'})) |
| 129 | 129 |
| 130 def Update(config, active_master, c): | 130 def Update(config, active_master, c): |
| 131 return helper.Update(c) | 131 return helper.Update(c) |
| OLD | NEW |