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 29 matching lines...) Expand all Loading... |
40 | 40 |
41 F('f_contentshell_win_rel', win().ChromiumWebkitLatestFactory( | 41 F('f_contentshell_win_rel', win().ChromiumWebkitLatestFactory( |
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_files': [ | 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 })) | 62 })) |
63 | 63 |
64 | 64 |
65 def Update(_config, active_master, c): | 65 def Update(_config, active_master, c): |
66 return helper.Update(c) | 66 return helper.Update(c) |
OLD | NEW |