| 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 19 matching lines...) Expand all Loading... |
| 30 # | 30 # |
| 31 # Content Shell Layouttests | 31 # Content Shell Layouttests |
| 32 # | 32 # |
| 33 | 33 |
| 34 B('WebKit (Content Shell) Linux', 'f_contentshell_linux_rel', | 34 B('WebKit (Content Shell) Linux', 'f_contentshell_linux_rel', |
| 35 scheduler='s1_contentshell_webkit_rel') | 35 scheduler='s1_contentshell_webkit_rel') |
| 36 | 36 |
| 37 F('f_contentshell_linux_rel', linux().ChromiumWebkitLatestFactory( | 37 F('f_contentshell_linux_rel', linux().ChromiumWebkitLatestFactory( |
| 38 target='Release', | 38 target='Release', |
| 39 tests=[ | 39 tests=[ |
| 40 'webkit', | 40 'webkit', |
| 41 ], | 41 ], |
| 42 options=[ | 42 options=[ |
| 43 '--compiler=goma', | 43 '--build-tool=ninja', |
| 44 'content_shell_builder', | 44 '--compiler=goma', |
| 45 '--', |
| 46 'content_shell_builder', |
| 45 ], | 47 ], |
| 46 factory_properties={ | 48 factory_properties={ |
| 47 'additional_expectations_files': [ | 49 'additional_expectations_files': [ |
| 48 ['content', 'shell', 'layout_tests', 'TestExpectations' ], | 50 ['content', 'shell', 'layout_tests', 'TestExpectations' ], |
| 49 ], | 51 ], |
| 50 'additional_drt_flag': '--dump-render-tree', | 52 'additional_drt_flag': '--dump-render-tree', |
| 51 'archive_webkit_results': True, | 53 'archive_webkit_results': True, |
| 52 'test_results_server': 'test-results.appspot.com', | 54 'test_results_server': 'test-results.appspot.com', |
| 53 'driver_name': 'content_shell' | 55 'driver_name': 'content_shell', |
| 56 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, |
| 54 })) | 57 })) |
| 55 | 58 |
| 56 | 59 |
| 57 def Update(config, active_master, c): | 60 def Update(config, active_master, c): |
| 58 return helper.Update(c) | 61 return helper.Update(c) |
| OLD | NEW |