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 # WebKit test builders using the Skia graphics library. | 5 # WebKit test builders using the Skia graphics library. |
6 | 6 |
7 from master import master_config | 7 from master import master_config |
8 from master.factory import chromium_factory | 8 from master.factory import chromium_factory |
9 | 9 |
10 import config | 10 import config |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 F('f_webkit_rel_tests', mac().ChromiumFactory( | 69 F('f_webkit_rel_tests', mac().ChromiumFactory( |
70 slave_type='Tester', | 70 slave_type='Tester', |
71 build_url=rel_archive, | 71 build_url=rel_archive, |
72 tests=[ | 72 tests=[ |
73 'test_shell', | 73 'test_shell', |
74 'webkit', | 74 'webkit', |
75 'webkit_lint', | 75 'webkit_lint', |
76 'webkit_unit', | 76 'webkit_unit', |
77 ], | 77 ], |
78 factory_properties={ | 78 factory_properties={ |
79 'additional_expectations_files': [ | 79 'additional_expectations': [ |
80 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], | 80 ['webkit', 'tools', 'layout_tests', 'test_expectations.txt' ], |
81 ], | 81 ], |
82 'archive_webkit_results': ActiveMaster.is_production_host, | 82 'archive_webkit_results': ActiveMaster.is_production_host, |
83 'generate_gtest_json': True, | 83 'generate_gtest_json': True, |
84 'layout_test_platform': 'chromium-mac', | 84 'layout_test_platform': 'chromium-mac', |
85 'test_results_server': 'test-results.appspot.com', | 85 'test_results_server': 'test-results.appspot.com', |
86 })) | 86 })) |
87 | 87 |
88 ################################################################################ | 88 ################################################################################ |
89 ## | 89 ## |
90 ################################################################################ | 90 ################################################################################ |
91 | 91 |
92 def Update(_config, active_master, c): | 92 def Update(_config, active_master, c): |
93 return helper.Update(c) | 93 return helper.Update(c) |
OLD | NEW |