| 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 13 matching lines...) Expand all Loading... |
| 24 | 24 |
| 25 # | 25 # |
| 26 # Main release scheduler for webkit | 26 # Main release scheduler for webkit |
| 27 # | 27 # |
| 28 S('s2_contentshell_webkit_rel', branch='trunk', treeStableTimer=60) | 28 S('s2_contentshell_webkit_rel', branch='trunk', treeStableTimer=60) |
| 29 | 29 |
| 30 # | 30 # |
| 31 # Content Shell Layouttests | 31 # Content Shell Layouttests |
| 32 # | 32 # |
| 33 | 33 |
| 34 B('WebKit (Content Shell) Mac', | 34 B('WebKit (Content Shell) Mac10.6', |
| 35 'f_contentshell_mac_rel', | 35 'f_contentshell_mac_rel', |
| 36 scheduler='s2_contentshell_webkit_rel') | 36 scheduler='s2_contentshell_webkit_rel') |
| 37 | 37 |
| 38 F('f_contentshell_mac_rel', mac().ChromiumWebkitLatestFactory( | 38 F('f_contentshell_mac_rel', mac().ChromiumWebkitLatestFactory( |
| 39 target='Release', | 39 target='Release', |
| 40 tests=[ | 40 tests=[ |
| 41 'webkit', | 41 'webkit', |
| 42 ], | 42 ], |
| 43 options=[ | 43 options=[ |
| 44 '--build-tool=ninja', | 44 '--build-tool=ninja', |
| (...skipping 10 matching lines...) Expand all Loading... |
| 55 'gclient_env': { | 55 'gclient_env': { |
| 56 'GYP_GENERATORS':'ninja', | 56 'GYP_GENERATORS':'ninja', |
| 57 'GYP_DEFINES':'fastbuild=1', | 57 'GYP_DEFINES':'fastbuild=1', |
| 58 }, | 58 }, |
| 59 'test_results_server': 'test-results.appspot.com', | 59 'test_results_server': 'test-results.appspot.com', |
| 60 })) | 60 })) |
| 61 | 61 |
| 62 | 62 |
| 63 def Update(config, active_master, c): | 63 def Update(config, active_master, c): |
| 64 return helper.Update(c) | 64 return helper.Update(c) |
| OLD | NEW |