| 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 for test in test_obj.tests: | 108 for test in test_obj.tests: |
| 109 run_test_cmd.extend(['-f', test]) | 109 run_test_cmd.extend(['-f', test]) |
| 110 if test_obj.extra_args: | 110 if test_obj.extra_args: |
| 111 run_test_cmd.extend(test_obj.extra_args) | 111 run_test_cmd.extend(test_obj.extra_args) |
| 112 commands.append(run_test_cmd) | 112 commands.append(run_test_cmd) |
| 113 return commands | 113 return commands |
| 114 | 114 |
| 115 | 115 |
| 116 def GetBotStepMap(): | 116 def GetBotStepMap(): |
| 117 compile_step = ['compile'] | 117 compile_step = ['compile'] |
| 118 std_host_tests = ['check_webview_licenses', 'findbugs'] | 118 std_host_tests = ['check_webview_licenses', 'findbugs', 'lint'] |
| 119 std_build_steps = ['compile', 'zip_build'] | 119 std_build_steps = ['compile', 'zip_build'] |
| 120 std_test_steps = ['extract_build'] | 120 std_test_steps = ['extract_build'] |
| 121 std_tests = ['ui', 'unit'] | 121 std_tests = ['ui', 'unit'] |
| 122 flakiness_server = ( | 122 flakiness_server = ( |
| 123 '--flakiness-server=%s' % constants.UPSTREAM_FLAKINESS_SERVER) | 123 '--flakiness-server=%s' % constants.UPSTREAM_FLAKINESS_SERVER) |
| 124 experimental = ['--experimental'] | 124 experimental = ['--experimental'] |
| 125 | 125 |
| 126 B = BotConfig | 126 B = BotConfig |
| 127 H = (lambda steps, extra_args=None, extra_gyp=None, target_arch=None : | 127 H = (lambda steps, extra_args=None, extra_gyp=None, target_arch=None : |
| 128 HostConfig('build/android/buildbot/bb_host_steps.py', steps, extra_args, | 128 HostConfig('build/android/buildbot/bb_host_steps.py', steps, extra_args, |
| 129 extra_gyp, target_arch)) | 129 extra_gyp, target_arch)) |
| 130 T = (lambda tests, extra_args=None : | 130 T = (lambda tests, extra_args=None : |
| 131 TestConfig('build/android/buildbot/bb_device_steps.py', tests, | 131 TestConfig('build/android/buildbot/bb_device_steps.py', tests, |
| 132 extra_args)) | 132 extra_args)) |
| 133 | 133 |
| 134 bot_configs = [ | 134 bot_configs = [ |
| 135 # Main builders | 135 # Main builders |
| 136 B('main-builder-dbg', H(std_build_steps + std_host_tests)), | 136 B('main-builder-dbg', H(std_build_steps)), |
| 137 B('main-builder-rel', H(std_build_steps)), | 137 B('main-builder-rel', H(std_build_steps)), |
| 138 B('main-clang-builder', | 138 B('main-clang-builder', |
| 139 H(compile_step, extra_gyp='clang=1 component=shared_library')), | 139 H(compile_step + std_host_tests, |
| 140 extra_gyp='clang=1 component=shared_library')), |
| 140 B('main-clobber', H(compile_step)), | 141 B('main-clobber', H(compile_step)), |
| 141 B('main-tests', H(std_test_steps), T(std_tests, [flakiness_server])), | 142 B('main-tests', H(std_test_steps), T(std_tests, [flakiness_server])), |
| 142 | 143 |
| 143 # Other waterfalls | 144 # Other waterfalls |
| 144 B('asan-builder-tests', H(compile_step, extra_gyp='asan=1'), | 145 B('asan-builder-tests', H(compile_step, extra_gyp='asan=1'), |
| 145 T(std_tests, ['--asan'])), | 146 T(std_tests, ['--asan'])), |
| 146 B('blink-try-builder', H(compile_step)), | 147 B('blink-try-builder', H(compile_step)), |
| 147 B('chromedriver-fyi-tests-dbg', H(std_test_steps), | 148 B('chromedriver-fyi-tests-dbg', H(std_test_steps), |
| 148 T(['chromedriver'], ['--install=ChromiumTestShell'])), | 149 T(['chromedriver'], ['--install=ChromiumTestShell'])), |
| 149 B('fyi-x86-builder-dbg', | 150 B('fyi-x86-builder-dbg', |
| 150 H(compile_step + std_host_tests, experimental, target_arch='x86')), | 151 H(compile_step, experimental, target_arch='x86')), |
| 151 B('fyi-builder-dbg', | 152 B('fyi-builder-dbg', |
| 152 H(std_build_steps + std_host_tests, experimental, | 153 H(std_build_steps, experimental, |
| 153 extra_gyp='emma_coverage=1')), | 154 extra_gyp='emma_coverage=1')), |
| 154 B('x86-builder-dbg', | 155 B('x86-builder-dbg', |
| 155 H(compile_step + std_host_tests, target_arch='x86')), | 156 H(compile_step, target_arch='x86')), |
| 156 B('fyi-builder-rel', H(std_build_steps, experimental)), | 157 B('fyi-builder-rel', H(std_build_steps, experimental)), |
| 157 B('fyi-tests', H(std_test_steps), | 158 B('fyi-tests', H(std_test_steps), |
| 158 T(std_tests, ['--experimental', flakiness_server, | 159 T(std_tests, ['--experimental', flakiness_server, |
| 159 '--coverage-bucket', CHROMIUM_COVERAGE_BUCKET])), | 160 '--coverage-bucket', CHROMIUM_COVERAGE_BUCKET])), |
| 160 B('fyi-component-builder-tests-dbg', | 161 B('fyi-component-builder-tests-dbg', |
| 161 H(compile_step, extra_gyp='component=shared_library'), | 162 H(compile_step, extra_gyp='component=shared_library'), |
| 162 T(std_tests, ['--experimental', flakiness_server])), | 163 T(std_tests, ['--experimental', flakiness_server])), |
| 163 B('gpu-builder-tests-dbg', H(compile_step), T(['gpu'])), | 164 B('gpu-builder-tests-dbg', H(compile_step), T(['gpu'])), |
| 164 B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression'])), | 165 B('perf-bisect-builder-tests-dbg', H(['bisect_perf_regression'])), |
| 165 B('perf-tests-rel', H(std_test_steps), | 166 B('perf-tests-rel', H(std_test_steps), |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 for command in commands: | 283 for command in commands: |
| 283 print 'Will run: ', bb_utils.CommandToString(command) | 284 print 'Will run: ', bb_utils.CommandToString(command) |
| 284 print | 285 print |
| 285 | 286 |
| 286 env = GetEnvironment(bot_config.host_obj, options.testing) | 287 env = GetEnvironment(bot_config.host_obj, options.testing) |
| 287 return RunBotCommands(options, commands, env) | 288 return RunBotCommands(options, commands, env) |
| 288 | 289 |
| 289 | 290 |
| 290 if __name__ == '__main__': | 291 if __name__ == '__main__': |
| 291 sys.exit(main(sys.argv)) | 292 sys.exit(main(sys.argv)) |
| OLD | NEW |