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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 T(std_tests, ['--experimental', flakiness_server])), | 162 T(std_tests, ['--experimental', flakiness_server])), |
163 B('gpu-builder-tests-dbg', H(compile_step), T(['gpu'])), | 163 B('gpu-builder-tests-dbg', H(compile_step), T(['gpu'])), |
164 B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression'])), | 164 B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression'])), |
165 B('perf-tests-rel', H(std_test_steps), | 165 B('perf-tests-rel', H(std_test_steps), |
166 T([], ['--install=ChromiumTestShell'])), | 166 T([], ['--install=ChromiumTestShell'])), |
167 B('webkit-latest-webkit-tests', H(std_test_steps), | 167 B('webkit-latest-webkit-tests', H(std_test_steps), |
168 T(['webkit_layout', 'webkit'], ['--auto-reconnect'])), | 168 T(['webkit_layout', 'webkit'], ['--auto-reconnect'])), |
169 B('webkit-latest-contentshell', H(compile_step), | 169 B('webkit-latest-contentshell', H(compile_step), |
170 T(['webkit_layout'], ['--auto-reconnect'])), | 170 T(['webkit_layout'], ['--auto-reconnect'])), |
171 B('builder-unit-tests', H(compile_step), T(['unit'])), | 171 B('builder-unit-tests', H(compile_step), T(['unit'])), |
172 B('webrtc-builder', | 172 B('webrtc-chromium-builder', |
| 173 H(std_build_steps, |
| 174 extra_args=['--build-targets=content_browsertests_apk'])), |
| 175 B('webrtc-native-builder', |
173 H(std_build_steps, | 176 H(std_build_steps, |
174 extra_args=['--build-targets=android_builder_webrtc'], | 177 extra_args=['--build-targets=android_builder_webrtc'], |
175 extra_gyp='include_tests=1 enable_tracing=1')), | 178 extra_gyp='include_tests=1 enable_tracing=1')), |
176 B('webrtc-tests', H(['download_webrtc_resources'] + std_test_steps), | 179 B('webrtc-chromium-tests', H(std_test_steps), |
177 T(['webrtc'], [flakiness_server])), | 180 T(['webrtc_chromium'], [flakiness_server])), |
| 181 B('webrtc-native-tests', |
| 182 H(['download_webrtc_resources'] + std_test_steps), |
| 183 T(['webrtc_native'], [flakiness_server])), |
178 | 184 |
179 # Generic builder config (for substring match). | 185 # Generic builder config (for substring match). |
180 B('builder', H(std_build_steps)), | 186 B('builder', H(std_build_steps)), |
181 ] | 187 ] |
182 | 188 |
183 bot_map = dict((config.bot_id, config) for config in bot_configs) | 189 bot_map = dict((config.bot_id, config) for config in bot_configs) |
184 | 190 |
185 # These bots have identical configuration to ones defined earlier. | 191 # These bots have identical configuration to ones defined earlier. |
186 copy_map = [ | 192 copy_map = [ |
187 ('lkgr-clobber', 'main-clobber'), | 193 ('lkgr-clobber', 'main-clobber'), |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 for command in commands: | 282 for command in commands: |
277 print 'Will run: ', bb_utils.CommandToString(command) | 283 print 'Will run: ', bb_utils.CommandToString(command) |
278 print | 284 print |
279 | 285 |
280 env = GetEnvironment(bot_config.host_obj, options.testing) | 286 env = GetEnvironment(bot_config.host_obj, options.testing) |
281 return RunBotCommands(options, commands, env) | 287 return RunBotCommands(options, commands, env) |
282 | 288 |
283 | 289 |
284 if __name__ == '__main__': | 290 if __name__ == '__main__': |
285 sys.exit(main(sys.argv)) | 291 sys.exit(main(sys.argv)) |
OLD | NEW |