OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # | 2 # |
3 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
6 | 6 |
7 import collections | 7 import collections |
8 import copy | 8 import copy |
9 import json | 9 import json |
10 import os | 10 import os |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 def T(tests, extra_args=None): | 112 def T(tests, extra_args=None): |
113 return TestConfig(tests, extra_args) | 113 return TestConfig(tests, extra_args) |
114 | 114 |
115 def H(host_step_args, extra_gyp=None, target_arch=None): | 115 def H(host_step_args, extra_gyp=None, target_arch=None): |
116 return HostConfig(host_step_args, extra_gyp, target_arch) | 116 return HostConfig(host_step_args, extra_gyp, target_arch) |
117 | 117 |
118 bot_configs = [ | 118 bot_configs = [ |
119 # Main builders | 119 # Main builders |
120 B('main-builder-dbg', H(std_build_opts + std_host_tests)), | 120 B('main-builder-dbg', H(std_build_opts + std_host_tests)), |
121 B('main-builder-rel', H(std_build_opts)), | 121 B('main-builder-rel', H(std_build_opts)), |
122 B('main-clang-builder', H(compile_opt, 'clang=1')), | 122 B('main-clang-builder', |
| 123 H(compile_opt, 'clang=1 component=shared_library')), |
123 B('main-clobber', H(compile_opt)), | 124 B('main-clobber', H(compile_opt)), |
124 B('main-tests', H(std_test_opts), T(std_tests, [flakiness_server])), | 125 B('main-tests', H(std_test_opts), T(std_tests, [flakiness_server])), |
125 | 126 |
126 # Other waterfalls | 127 # Other waterfalls |
127 B('asan-builder-tests', H(compile_opt, 'asan=1'), | 128 B('asan-builder-tests', H(compile_opt, 'asan=1'), |
128 T(std_tests, ['--asan'])), | 129 T(std_tests, ['--asan'])), |
129 B('chromedriver-fyi-tests-dbg', H(std_test_opts), | 130 B('chromedriver-fyi-tests-dbg', H(std_test_opts), |
130 T(['chromedriver'], ['--install=ChromiumTestShell'])), | 131 T(['chromedriver'], ['--install=ChromiumTestShell'])), |
131 B('fyi-builder-dbg', | 132 B('fyi-builder-dbg', |
132 H(std_build_opts + std_host_tests + ['--experimental'])), | 133 H(std_build_opts + std_host_tests + ['--experimental'])), |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 sys.stdout.flush() | 223 sys.stdout.flush() |
223 if options.testing: | 224 if options.testing: |
224 env['BUILDBOT_TESTING'] = '1' | 225 env['BUILDBOT_TESTING'] = '1' |
225 return_code = subprocess.call(command, cwd=bb_utils.CHROME_SRC, env=env) | 226 return_code = subprocess.call(command, cwd=bb_utils.CHROME_SRC, env=env) |
226 if return_code != 0: | 227 if return_code != 0: |
227 return return_code | 228 return return_code |
228 | 229 |
229 | 230 |
230 if __name__ == '__main__': | 231 if __name__ == '__main__': |
231 sys.exit(main(sys.argv)) | 232 sys.exit(main(sys.argv)) |
OLD | NEW |