| 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 defaults = {} | 8 defaults = {} |
| 9 | 9 |
| 10 helper = master_config.Helper(defaults) | 10 helper = master_config.Helper(defaults) |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 ], | 324 ], |
| 325 factory_properties={ | 325 factory_properties={ |
| 326 'generate_gtest_json': True, | 326 'generate_gtest_json': True, |
| 327 'process_dumps': True, | 327 'process_dumps': True, |
| 328 'sharded_tests': sharded_tests, | 328 'sharded_tests': sharded_tests, |
| 329 'start_crash_handler': True, | 329 'start_crash_handler': True, |
| 330 })) | 330 })) |
| 331 | 331 |
| 332 B('Chrome Frame Tests (ie7)', 'rel_cf', 'testers|windows', 'win_rel_trigger', | 332 B('Chrome Frame Tests (ie7)', 'rel_cf', 'testers|windows', 'win_rel_trigger', |
| 333 notify_on_missing=True) | 333 notify_on_missing=True) |
| 334 B('Chrome Frame Tests (ie8)', 'rel_cf', 'testers|windows|chrome_frame', | 334 B('Chrome Frame Tests (ie8)', 'rel_cf', 'testers|windows', 'win_rel_trigger', |
| 335 'win_rel_trigger', notify_on_missing=True) | 335 notify_on_missing=True) |
| 336 B('Chrome Frame Tests (ie9)', 'rel_cf', 'testers|windows', 'win_rel_trigger', | 336 B('Chrome Frame Tests (ie9)', 'rel_cf', 'testers|windows', 'win_rel_trigger', |
| 337 notify_on_missing=True) | 337 notify_on_missing=True) |
| 338 | 338 |
| 339 ################################################################################ | 339 ################################################################################ |
| 340 ## Debug | 340 ## Debug |
| 341 ################################################################################ | 341 ################################################################################ |
| 342 | 342 |
| 343 dbg_archive = master_config.GetArchiveUrl('ChromiumWin', 'Win Builder (dbg)', | 343 dbg_archive = master_config.GetArchiveUrl('ChromiumWin', 'Win Builder (dbg)', |
| 344 'cr-win-dbg', 'win32') | 344 'cr-win-dbg', 'win32') |
| 345 | 345 |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 ], | 528 ], |
| 529 factory_properties={ | 529 factory_properties={ |
| 530 'generate_gtest_json': True, | 530 'generate_gtest_json': True, |
| 531 'process_dumps': True, | 531 'process_dumps': True, |
| 532 'sharded_tests': sharded_tests, | 532 'sharded_tests': sharded_tests, |
| 533 'start_crash_handler': True, | 533 'start_crash_handler': True, |
| 534 })) | 534 })) |
| 535 | 535 |
| 536 def Update(config, active_master, c): | 536 def Update(config, active_master, c): |
| 537 return helper.Update(c) | 537 return helper.Update(c) |
| OLD | NEW |