| 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 import master_site_config | 8 import master_site_config |
| 9 | 9 |
| 10 ActiveMaster = master_site_config.ChromiumWebkit | 10 ActiveMaster = master_site_config.ChromiumWebkit |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 B('WebKit Win Builder', 'f_webkit_win_rel', | 50 B('WebKit Win Builder', 'f_webkit_win_rel', |
| 51 scheduler='global_scheduler', builddir='webkit-win-latest-rel', | 51 scheduler='global_scheduler', builddir='webkit-win-latest-rel', |
| 52 auto_reboot=False) | 52 auto_reboot=False) |
| 53 F('f_webkit_win_rel', win().ChromiumFactory( | 53 F('f_webkit_win_rel', win().ChromiumFactory( |
| 54 slave_type='Builder', | 54 slave_type='Builder', |
| 55 options=['--build-tool=ninja', 'all_webkit'], | 55 options=['--build-tool=ninja', 'all_webkit'], |
| 56 factory_properties={ | 56 factory_properties={ |
| 57 'trigger': 's4_webkit_rel_trigger', | 57 'trigger': 's4_webkit_rel_trigger', |
| 58 'blink_config': 'blink', | 58 'blink_config': 'blink', |
| 59 'gclient_env': { | 59 'gclient_env': { |
| 60 'GYP_DEFINES': 'use_aura=0', |
| 60 'GYP_GENERATORS':'ninja', | 61 'GYP_GENERATORS':'ninja', |
| 61 }, | 62 }, |
| 62 })) | 63 })) |
| 63 | 64 |
| 64 # | 65 # |
| 65 # Win Rel WebKit testers | 66 # Win Rel WebKit testers |
| 66 # | 67 # |
| 67 B('WebKit XP', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger') | 68 B('WebKit XP', 'f_webkit_rel_tests', scheduler='s4_webkit_rel_trigger') |
| 68 F('f_webkit_rel_tests', win().ChromiumFactory( | 69 F('f_webkit_rel_tests', win().ChromiumFactory( |
| 69 slave_type='Tester', | 70 slave_type='Tester', |
| (...skipping 27 matching lines...) Expand all Loading... |
| 97 B('WebKit Win Builder (dbg)', 'f_webkit_win_dbg', scheduler='global_scheduler', | 98 B('WebKit Win Builder (dbg)', 'f_webkit_win_dbg', scheduler='global_scheduler', |
| 98 builddir='webkit-win-latest-dbg', auto_reboot=False) | 99 builddir='webkit-win-latest-dbg', auto_reboot=False) |
| 99 F('f_webkit_win_dbg', win().ChromiumFactory( | 100 F('f_webkit_win_dbg', win().ChromiumFactory( |
| 100 target='Debug', | 101 target='Debug', |
| 101 slave_type='Builder', | 102 slave_type='Builder', |
| 102 options=['--build-tool=ninja', 'all_webkit'], | 103 options=['--build-tool=ninja', 'all_webkit'], |
| 103 factory_properties={ | 104 factory_properties={ |
| 104 'trigger': 's4_webkit_dbg_trigger', | 105 'trigger': 's4_webkit_dbg_trigger', |
| 105 'blink_config': 'blink', | 106 'blink_config': 'blink', |
| 106 'gclient_env': { | 107 'gclient_env': { |
| 108 'GYP_DEFINES': 'use_aura=0', |
| 107 'GYP_GENERATORS':'ninja', | 109 'GYP_GENERATORS':'ninja', |
| 108 }, | 110 }, |
| 109 })) | 111 })) |
| 110 | 112 |
| 111 # | 113 # |
| 112 # Win Dbg WebKit testers | 114 # Win Dbg WebKit testers |
| 113 # | 115 # |
| 114 | 116 |
| 115 B('WebKit Win7 (dbg)', 'f_webkit_dbg_tests', | 117 B('WebKit Win7 (dbg)', 'f_webkit_dbg_tests', |
| 116 scheduler='s4_webkit_dbg_trigger') | 118 scheduler='s4_webkit_dbg_trigger') |
| 117 F('f_webkit_dbg_tests', win().ChromiumFactory( | 119 F('f_webkit_dbg_tests', win().ChromiumFactory( |
| 118 target='Debug', | 120 target='Debug', |
| 119 slave_type='Tester', | 121 slave_type='Tester', |
| 120 build_url=dbg_archive, | 122 build_url=dbg_archive, |
| 121 tests=blink_tests, | 123 tests=blink_tests, |
| 122 factory_properties={ | 124 factory_properties={ |
| 123 'archive_webkit_results': ActiveMaster.is_production_host, | 125 'archive_webkit_results': ActiveMaster.is_production_host, |
| 124 'generate_gtest_json': True, | 126 'generate_gtest_json': True, |
| 125 'test_results_server': 'test-results.appspot.com', | 127 'test_results_server': 'test-results.appspot.com', |
| 126 'blink_config': 'blink', | 128 'blink_config': 'blink', |
| 127 })) | 129 })) |
| 128 | 130 |
| 129 def Update(_config, _active_master, c): | 131 def Update(_config, _active_master, c): |
| 130 return helper.Update(c) | 132 return helper.Update(c) |
| OLD | NEW |