| 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 | 5 |
| 6 from master import master_config | 6 from master import master_config |
| 7 from master.factory import chromium_factory | 7 from master.factory import chromium_factory |
| 8 | 8 |
| 9 defaults = {} | 9 defaults = {} |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 # | 25 # |
| 26 # Main release scheduler for webkit | 26 # Main release scheduler for webkit |
| 27 # | 27 # |
| 28 S('s10_webkit_rel', branch='trunk', treeStableTimer=60) | 28 S('s10_webkit_rel', branch='trunk', treeStableTimer=60) |
| 29 | 29 |
| 30 # | 30 # |
| 31 # ChromiumOS Rel Builder | 31 # ChromiumOS Rel Builder |
| 32 # | 32 # |
| 33 B('Linux ChromiumOS Builder', 'f_chromiumos_rel', scheduler='s10_webkit_rel', | 33 B('Linux ChromiumOS Builder', 'f_chromiumos_rel', scheduler='s10_webkit_rel', |
| 34 auto_reboot=False) | 34 auto_reboot=False) |
| 35 F('f_chromiumos_rel', linux().ChromiumOSWebkitLatestFactory( | 35 F('f_chromiumos_rel', linux().ChromiumOSFactory( |
| 36 slave_type='Builder', | 36 slave_type='Builder', |
| 37 tests=[], | 37 tests=[], |
| 38 options=['--compiler=goma', | 38 options=['--compiler=goma', |
| 39 'aura_builder', | 39 'aura_builder', |
| 40 'base_unittests', | 40 'base_unittests', |
| 41 'browser_tests', | 41 'browser_tests', |
| 42 'cacheinvalidation_unittests', | 42 'cacheinvalidation_unittests', |
| 43 'compositor_unittests', | 43 'compositor_unittests', |
| 44 'content_browsertests', | 44 'content_browsertests', |
| 45 'content_unittests', | 45 'content_unittests', |
| (...skipping 10 matching lines...) Expand all Loading... |
| 56 'ppapi_unittests', | 56 'ppapi_unittests', |
| 57 'printing_unittests', | 57 'printing_unittests', |
| 58 'remoting_unittests', | 58 'remoting_unittests', |
| 59 'sql_unittests', | 59 'sql_unittests', |
| 60 'sync_unit_tests', | 60 'sync_unit_tests', |
| 61 'ui_unittests', | 61 'ui_unittests', |
| 62 'unit_tests', | 62 'unit_tests', |
| 63 'views_unittests', | 63 'views_unittests', |
| 64 ], | 64 ], |
| 65 factory_properties={ | 65 factory_properties={ |
| 66 'gclient_env': {'GYP_DEFINES': 'chromeos=1'} | 66 'gclient_env': {'GYP_DEFINES': 'chromeos=1'}, |
| 67 'blink_config': 'blink', |
| 67 })) | 68 })) |
| 68 | 69 |
| 69 | 70 |
| 70 def Update(config, active_master, c): | 71 def Update(config, active_master, c): |
| 71 return helper.Update(c) | 72 return helper.Update(c) |
| OLD | NEW |