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 from master import master_config | 5 from master import master_config |
6 from master.factory import chromium_factory | 6 from master.factory import chromium_factory |
7 | 7 |
8 import config | 8 import config |
9 | 9 |
10 ActiveMaster = config.Master.ChromiumWebkit | 10 ActiveMaster = config.Master.ChromiumWebkit |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 auto_reboot=False) | 66 auto_reboot=False) |
67 F('f_webkit_linux_rel_asan', linux().ChromiumWebkitLatestFactory( | 67 F('f_webkit_linux_rel_asan', linux().ChromiumWebkitLatestFactory( |
68 tests=['webkit'], | 68 tests=['webkit'], |
69 options=[ | 69 options=[ |
70 '--build-tool=ninja', | 70 '--build-tool=ninja', |
71 '--compiler=goma-clang', | 71 '--compiler=goma-clang', |
72 '--', | 72 '--', |
73 'DumpRenderTree' | 73 'DumpRenderTree' |
74 ], | 74 ], |
75 factory_properties={ | 75 factory_properties={ |
76 'additional_expectations_files': [ | 76 'additional_expectations': [ |
77 ['webkit', 'tools', 'layout_tests', 'test_expectations_asan.txt' ], | 77 ['webkit', 'tools', 'layout_tests', 'test_expectations_asan.txt' ], |
78 ], | 78 ], |
79 'gs_bucket': 'gs://webkit-asan', | 79 'gs_bucket': 'gs://webkit-asan', |
80 'gclient_env': {'GYP_DEFINES': asan_gyp, 'GYP_GENERATORS': 'ninja'}, | 80 'gclient_env': {'GYP_DEFINES': asan_gyp, 'GYP_GENERATORS': 'ninja'}, |
81 'time_out_ms': '18000' | 81 'time_out_ms': '18000' |
82 })) | 82 })) |
83 | 83 |
84 | 84 |
85 ################################################################################ | 85 ################################################################################ |
86 ## Debug | 86 ## Debug |
(...skipping 29 matching lines...) Expand all Loading... |
116 ], | 116 ], |
117 factory_properties={ | 117 factory_properties={ |
118 'archive_webkit_results': ActiveMaster.is_production_host, | 118 'archive_webkit_results': ActiveMaster.is_production_host, |
119 'generate_gtest_json': True, | 119 'generate_gtest_json': True, |
120 'test_results_server': 'test-results.appspot.com', | 120 'test_results_server': 'test-results.appspot.com', |
121 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, | 121 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, |
122 })) | 122 })) |
123 | 123 |
124 def Update(_config, active_master, c): | 124 def Update(_config, active_master, c): |
125 return helper.Update(c) | 125 return helper.Update(c) |
OLD | NEW |