| 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 16 matching lines...) Expand all Loading... |
| 27 # | 27 # |
| 28 S('webkit_linux_rel', branch='src', treeStableTimer=60) | 28 S('webkit_linux_rel', branch='src', treeStableTimer=60) |
| 29 | 29 |
| 30 # | 30 # |
| 31 # Linux Rel Builder | 31 # Linux Rel Builder |
| 32 # | 32 # |
| 33 B('Webkit Linux', 'webkit_linux_rel', 'compile|testers', 'webkit_linux_rel', | 33 B('Webkit Linux', 'webkit_linux_rel', 'compile|testers', 'webkit_linux_rel', |
| 34 builddir='webkit-linux-rel-x64') | 34 builddir='webkit-linux-rel-x64') |
| 35 F('webkit_linux_rel', linux().ChromiumFactory( | 35 F('webkit_linux_rel', linux().ChromiumFactory( |
| 36 'webkit-linux-rel', | 36 'webkit-linux-rel', |
| 37 tests=['webkit', 'test_shell', 'webkit_unit'], | 37 tests=['webkit', 'webkit_gpu', 'test_shell', 'webkit_unit'], |
| 38 options=['test_shell', 'test_shell_tests', 'webkit_unit_tests'], | 38 options=['test_shell', 'test_shell_tests', 'webkit_unit_tests'], |
| 39 factory_properties={'archive_webkit_results': True, | 39 factory_properties={'archive_webkit_results': True, |
| 40 'test_results_server': 'test-results.appspot.com'})) | 40 'test_results_server': 'test-results.appspot.com'})) |
| 41 | 41 |
| 42 | 42 |
| 43 ################################################################################ | 43 ################################################################################ |
| 44 ## Debug | 44 ## Debug |
| 45 ################################################################################ | 45 ################################################################################ |
| 46 | 46 |
| 47 | 47 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 73 # Linux Dbg Unit testers | 73 # Linux Dbg Unit testers |
| 74 # | 74 # |
| 75 | 75 |
| 76 B('Webkit Linux Tests (dbg)(1)', 'dbg_webkit_1', 'testers', | 76 B('Webkit Linux Tests (dbg)(1)', 'dbg_webkit_1', 'testers', |
| 77 'webkit_linux_dbg_dep') | 77 'webkit_linux_dbg_dep') |
| 78 F('dbg_webkit_1', linux().ChromiumFactory( | 78 F('dbg_webkit_1', linux().ChromiumFactory( |
| 79 'webkit-dbg-linux-1', | 79 'webkit-dbg-linux-1', |
| 80 target='Debug', | 80 target='Debug', |
| 81 slave_type='Tester', | 81 slave_type='Tester', |
| 82 build_url=dbg_archive, | 82 build_url=dbg_archive, |
| 83 tests=['webkit', 'test_shell', 'webkit_unit'], | 83 tests=['webkit', 'webkit_gpu', 'test_shell', 'webkit_unit'], |
| 84 factory_properties={'archive_webkit_results': True, | 84 factory_properties={'archive_webkit_results': True, |
| 85 'test_results_server': 'test-results.appspot.com', | 85 'test_results_server': 'test-results.appspot.com', |
| 86 'layout_part': '1:3'})) | 86 'layout_part': '1:3'})) |
| 87 | 87 |
| 88 B('Webkit Linux Tests (dbg)(2)', 'dbg_webkit_2', 'testers', | 88 B('Webkit Linux Tests (dbg)(2)', 'dbg_webkit_2', 'testers', |
| 89 'webkit_linux_dbg_dep') | 89 'webkit_linux_dbg_dep') |
| 90 F('dbg_webkit_2', linux().ChromiumFactory( | 90 F('dbg_webkit_2', linux().ChromiumFactory( |
| 91 'webkit-dbg-linux-2', | 91 'webkit-dbg-linux-2', |
| 92 target='Debug', | 92 target='Debug', |
| 93 slave_type='Tester', | 93 slave_type='Tester', |
| 94 build_url=dbg_archive, | 94 build_url=dbg_archive, |
| 95 tests=['webkit'], | 95 tests=['webkit', 'webkit_gpu'], |
| 96 factory_properties={'archive_webkit_results': True, | 96 factory_properties={'archive_webkit_results': True, |
| 97 'test_results_server': 'test-results.appspot.com', | 97 'test_results_server': 'test-results.appspot.com', |
| 98 'layout_part': '2:3'})) | 98 'layout_part': '2:3'})) |
| 99 | 99 |
| 100 B('Webkit Linux Tests (dbg)(3)', 'dbg_webkit_3', 'testers', | 100 B('Webkit Linux Tests (dbg)(3)', 'dbg_webkit_3', 'testers', |
| 101 'webkit_linux_dbg_dep') | 101 'webkit_linux_dbg_dep') |
| 102 F('dbg_webkit_3', linux().ChromiumFactory( | 102 F('dbg_webkit_3', linux().ChromiumFactory( |
| 103 'webkit-dbg-linux-3', | 103 'webkit-dbg-linux-3', |
| 104 target='Debug', | 104 target='Debug', |
| 105 slave_type='Tester', | 105 slave_type='Tester', |
| 106 build_url=dbg_archive, | 106 build_url=dbg_archive, |
| 107 tests=['webkit'], | 107 tests=['webkit', 'webkit_gpu'], |
| 108 factory_properties={'archive_webkit_results': True, | 108 factory_properties={'archive_webkit_results': True, |
| 109 'test_results_server': 'test-results.appspot.com', | 109 'test_results_server': 'test-results.appspot.com', |
| 110 'layout_part': '3:3'})) | 110 'layout_part': '3:3'})) |
| 111 | 111 |
| 112 def Update(config, active_master, c): | 112 def Update(config, active_master, c): |
| 113 return helper.Update(c) | 113 return helper.Update(c) |
| OLD | NEW |