| 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 T([], ['--install=ChromiumTestShell'])), | 164 T([], ['--install=ChromiumTestShell'])), |
| 165 B('webkit-latest-webkit-tests', H(std_test_steps), | 165 B('webkit-latest-webkit-tests', H(std_test_steps), |
| 166 T(['webkit_layout', 'webkit'], ['--auto-reconnect'])), | 166 T(['webkit_layout', 'webkit'], ['--auto-reconnect'])), |
| 167 B('webkit-latest-contentshell', H(compile_step), | 167 B('webkit-latest-contentshell', H(compile_step), |
| 168 T(['webkit_layout'], ['--auto-reconnect'])), | 168 T(['webkit_layout'], ['--auto-reconnect'])), |
| 169 B('builder-unit-tests', H(compile_step), T(['unit'])), | 169 B('builder-unit-tests', H(compile_step), T(['unit'])), |
| 170 B('webrtc-builder', | 170 B('webrtc-builder', |
| 171 H(std_build_steps, | 171 H(std_build_steps, |
| 172 extra_args=['--build-targets=android_builder_webrtc'], | 172 extra_args=['--build-targets=android_builder_webrtc'], |
| 173 extra_gyp='include_tests=1 enable_tracing=1')), | 173 extra_gyp='include_tests=1 enable_tracing=1')), |
| 174 B('webrtc-tests', H(std_test_steps), T(['webrtc'], [flakiness_server])), | 174 B('webrtc-tests', H(['download_webrtc_resources'] + std_test_steps), |
| 175 T(['webrtc'], [flakiness_server])), |
| 175 | 176 |
| 176 # Generic builder config (for substring match). | 177 # Generic builder config (for substring match). |
| 177 B('builder', H(std_build_steps)), | 178 B('builder', H(std_build_steps)), |
| 178 ] | 179 ] |
| 179 | 180 |
| 180 bot_map = dict((config.bot_id, config) for config in bot_configs) | 181 bot_map = dict((config.bot_id, config) for config in bot_configs) |
| 181 | 182 |
| 182 # These bots have identical configuration to ones defined earlier. | 183 # These bots have identical configuration to ones defined earlier. |
| 183 copy_map = [ | 184 copy_map = [ |
| 184 ('lkgr-clobber', 'main-clobber'), | 185 ('lkgr-clobber', 'main-clobber'), |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 for command in commands: | 274 for command in commands: |
| 274 print 'Will run: ', bb_utils.CommandToString(command) | 275 print 'Will run: ', bb_utils.CommandToString(command) |
| 275 print | 276 print |
| 276 | 277 |
| 277 env = GetEnvironment(bot_config.host_obj, options.testing) | 278 env = GetEnvironment(bot_config.host_obj, options.testing) |
| 278 return RunBotCommands(options, commands, env) | 279 return RunBotCommands(options, commands, env) |
| 279 | 280 |
| 280 | 281 |
| 281 if __name__ == '__main__': | 282 if __name__ == '__main__': |
| 282 sys.exit(main(sys.argv)) | 283 sys.exit(main(sys.argv)) |
| OLD | NEW |