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 master_site_config | 8 import master_site_config |
9 | 9 |
10 ActiveMaster = master_site_config.ChromiumWebkit | 10 ActiveMaster = master_site_config.ChromiumWebkit |
(...skipping 30 matching lines...) Expand all Loading... |
41 F('f_webkit_linux_rel', linux().ChromiumFactory( | 41 F('f_webkit_linux_rel', linux().ChromiumFactory( |
42 tests=blink_tests, | 42 tests=blink_tests, |
43 options=[ | 43 options=[ |
44 '--build-tool=ninja', | 44 '--build-tool=ninja', |
45 '--compiler=goma', | 45 '--compiler=goma', |
46 '--', | 46 '--', |
47 'all_webkit', | 47 'all_webkit', |
48 ], | 48 ], |
49 factory_properties={ | 49 factory_properties={ |
50 'archive_webkit_results': ActiveMaster.is_production_host, | 50 'archive_webkit_results': ActiveMaster.is_production_host, |
51 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, | 51 'gclient_env': { |
| 52 'GYP_DEFINES': 'use_ash=0 use_aura=0', |
| 53 'GYP_GENERATORS': 'ninja', |
| 54 }, |
52 'generate_gtest_json': True, | 55 'generate_gtest_json': True, |
53 'test_results_server': 'test-results.appspot.com', | 56 'test_results_server': 'test-results.appspot.com', |
54 'blink_config': 'blink', | 57 'blink_config': 'blink', |
55 })) | 58 })) |
56 | 59 |
57 B('WebKit Linux 32', 'f_webkit_linux_rel', scheduler='global_scheduler') | 60 B('WebKit Linux 32', 'f_webkit_linux_rel', scheduler='global_scheduler') |
58 | 61 |
59 asan_gyp = ('asan=1 linux_use_tcmalloc=0 ' | 62 asan_gyp = ('asan=1 linux_use_tcmalloc=0 ' |
60 'release_extra_cflags="-g -O1 -fno-inline-functions -fno-inline"') | 63 'release_extra_cflags="-g -O1 -fno-inline-functions -fno-inline"') |
61 | 64 |
62 B('WebKit Linux ASAN', 'f_webkit_linux_rel_asan', scheduler='global_scheduler', | 65 B('WebKit Linux ASAN', 'f_webkit_linux_rel_asan', scheduler='global_scheduler', |
63 auto_reboot=False) | 66 auto_reboot=False) |
64 F('f_webkit_linux_rel_asan', linux().ChromiumFactory( | 67 F('f_webkit_linux_rel_asan', linux().ChromiumFactory( |
65 tests=['webkit'], | 68 tests=['webkit'], |
66 options=[ | 69 options=[ |
67 '--build-tool=ninja', | 70 '--build-tool=ninja', |
68 '--compiler=goma-clang', | 71 '--compiler=goma-clang', |
69 '--', | 72 '--', |
70 'all_webkit' | 73 'all_webkit' |
71 ], | 74 ], |
72 factory_properties={ | 75 factory_properties={ |
73 'additional_expectations': [ | 76 'additional_expectations': [ |
74 ['webkit', 'tools', 'layout_tests', 'test_expectations_asan.txt' ], | 77 ['webkit', 'tools', 'layout_tests', 'test_expectations_asan.txt' ], |
75 ], | 78 ], |
76 'archive_webkit_results': ActiveMaster.is_production_host, | 79 'archive_webkit_results': ActiveMaster.is_production_host, |
77 'asan': True, | 80 'asan': True, |
78 'blink_config': 'blink', | 81 'blink_config': 'blink', |
79 'gclient_env': {'GYP_DEFINES': asan_gyp, 'GYP_GENERATORS': 'ninja'}, | 82 'gclient_env': { |
| 83 'GYP_DEFINES': asan_gyp + ' use_ash=0 use_aura=0', |
| 84 'GYP_GENERATORS': 'ninja', |
| 85 }, |
80 'generate_gtest_json': True, | 86 'generate_gtest_json': True, |
81 'gs_bucket': 'gs://webkit-asan', | 87 'gs_bucket': 'gs://webkit-asan', |
82 'test_results_server': 'test-results.appspot.com', | 88 'test_results_server': 'test-results.appspot.com', |
83 'time_out_ms': '18000', | 89 'time_out_ms': '18000', |
84 })) | 90 })) |
85 | 91 |
86 | 92 |
87 ################################################################################ | 93 ################################################################################ |
88 ## Debug | 94 ## Debug |
89 ################################################################################ | 95 ################################################################################ |
(...skipping 10 matching lines...) Expand all Loading... |
100 options=[ | 106 options=[ |
101 '--build-tool=ninja', | 107 '--build-tool=ninja', |
102 '--compiler=goma', | 108 '--compiler=goma', |
103 '--', | 109 '--', |
104 'all_webkit', | 110 'all_webkit', |
105 ], | 111 ], |
106 factory_properties={ | 112 factory_properties={ |
107 'archive_webkit_results': ActiveMaster.is_production_host, | 113 'archive_webkit_results': ActiveMaster.is_production_host, |
108 'generate_gtest_json': True, | 114 'generate_gtest_json': True, |
109 'test_results_server': 'test-results.appspot.com', | 115 'test_results_server': 'test-results.appspot.com', |
110 'gclient_env': { 'GYP_GENERATORS': 'ninja' }, | 116 'gclient_env': { |
| 117 'GYP_DEFINES': 'use_ash=0 use_aura=0', |
| 118 'GYP_GENERATORS':'ninja', |
| 119 }, |
111 'blink_config': 'blink', | 120 'blink_config': 'blink', |
112 })) | 121 })) |
113 | 122 |
114 def Update(_config, _active_master, c): | 123 def Update(_config, _active_master, c): |
115 return helper.Update(c) | 124 return helper.Update(c) |
OLD | NEW |