| 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 import config | 9 import config |
| 10 | 10 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 # | 31 # |
| 32 S('s3_contentshell_webkit_rel', branch='trunk', treeStableTimer=60) | 32 S('s3_contentshell_webkit_rel', branch='trunk', treeStableTimer=60) |
| 33 | 33 |
| 34 # | 34 # |
| 35 # Content Shell Layouttests | 35 # Content Shell Layouttests |
| 36 # | 36 # |
| 37 | 37 |
| 38 B('WebKit (Content Shell) Win', 'f_contentshell_win_rel', | 38 B('WebKit (Content Shell) Win', 'f_contentshell_win_rel', |
| 39 scheduler='s3_contentshell_webkit_rel') | 39 scheduler='s3_contentshell_webkit_rel') |
| 40 | 40 |
| 41 F('f_contentshell_win_rel', win().ChromiumWebkitLatestFactory( | 41 F('f_contentshell_win_rel', win().ChromiumFactory( |
| 42 target='Release', | 42 target='Release', |
| 43 slave_type='BuilderTester', | 43 slave_type='BuilderTester', |
| 44 tests=[ | 44 tests=[ |
| 45 'webkit', | 45 'webkit', |
| 46 ], | 46 ], |
| 47 project='all.sln;content_shell_builder', | 47 project='all.sln;content_shell_builder', |
| 48 factory_properties={ | 48 factory_properties={ |
| 49 'additional_drt_flag': '--dump-render-tree', | 49 'additional_drt_flag': '--dump-render-tree', |
| 50 'additional_expectations': [ | 50 'additional_expectations': [ |
| 51 [ 'third_party', | 51 [ 'third_party', |
| 52 'WebKit', | 52 'WebKit', |
| 53 'LayoutTests', | 53 'LayoutTests', |
| 54 'platform', | 54 'platform', |
| 55 'chromium', | 55 'chromium', |
| 56 'ContentShellTestExpectations' ], | 56 'ContentShellTestExpectations' ], |
| 57 ], | 57 ], |
| 58 'archive_webkit_results': ActiveMaster.is_production_host, | 58 'archive_webkit_results': ActiveMaster.is_production_host, |
| 59 'driver_name': 'content_shell', | 59 'driver_name': 'content_shell', |
| 60 'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}, | 60 'gclient_env': {'GYP_DEFINES': 'fastbuild=1'}, |
| 61 'test_results_server': 'test-results.appspot.com', | 61 'test_results_server': 'test-results.appspot.com', |
| 62 'blink_config': 'blink', |
| 62 })) | 63 })) |
| 63 | 64 |
| 64 | 65 |
| 65 def Update(_config, active_master, c): | 66 def Update(_config, active_master, c): |
| 66 return helper.Update(c) | 67 return helper.Update(c) |
| OLD | NEW |