Chromium Code Reviews| 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 23 matching lines...) Expand all Loading... | |
| 34 diff.append('+ %s=%s' % (key, pipes.quote(d2[key]))) | 34 diff.append('+ %s=%s' % (key, pipes.quote(d2[key]))) |
| 35 return '\n'.join(diff) | 35 return '\n'.join(diff) |
| 36 | 36 |
| 37 | 37 |
| 38 def GetEnvironment(host_obj, testing): | 38 def GetEnvironment(host_obj, testing): |
| 39 init_env = dict(os.environ) | 39 init_env = dict(os.environ) |
| 40 init_env['GYP_GENERATORS'] = 'ninja' | 40 init_env['GYP_GENERATORS'] = 'ninja' |
| 41 init_env['GOMA_DIR'] = bb_utils.GOMA_DIR | 41 init_env['GOMA_DIR'] = bb_utils.GOMA_DIR |
| 42 envsetup_cmd = '. build/android/envsetup.sh' | 42 envsetup_cmd = '. build/android/envsetup.sh' |
| 43 if host_obj.target_arch: | 43 if host_obj.target_arch: |
| 44 envsetup_cmd += ' --target_arch=%s' % host_obj.target_arch | 44 envsetup_cmd += ' --target-arch=%s' % host_obj.target_arch |
| 45 if testing: | 45 if testing: |
| 46 # Skip envsetup to avoid presubmit dependence on android deps. | 46 # Skip envsetup to avoid presubmit dependence on android deps. |
| 47 print 'Testing mode - skipping "%s"' % envsetup_cmd | 47 print 'Testing mode - skipping "%s"' % envsetup_cmd |
| 48 envsetup_cmd = ':' | 48 envsetup_cmd = ':' |
| 49 else: | 49 else: |
| 50 print 'Running %s' % envsetup_cmd | 50 print 'Running %s' % envsetup_cmd |
| 51 proc = subprocess.Popen(['bash', '-exc', | 51 proc = subprocess.Popen(['bash', '-exc', |
| 52 envsetup_cmd + ' >&2; python build/android/buildbot/env_to_json.py'], | 52 envsetup_cmd + ' >&2; python build/android/buildbot/env_to_json.py'], |
| 53 stdout=subprocess.PIPE, stderr=subprocess.PIPE, | 53 stdout=subprocess.PIPE, stderr=subprocess.PIPE, |
| 54 cwd=bb_utils.CHROME_SRC, env=init_env) | 54 cwd=bb_utils.CHROME_SRC, env=init_env) |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 B('main-clang-builder', | 124 B('main-clang-builder', |
| 125 H(compile_step, extra_gyp='clang=1 component=shared_library')), | 125 H(compile_step, extra_gyp='clang=1 component=shared_library')), |
| 126 B('main-clobber', H(compile_step)), | 126 B('main-clobber', H(compile_step)), |
| 127 B('main-tests', H(std_test_steps), T(std_tests, [flakiness_server])), | 127 B('main-tests', H(std_test_steps), T(std_tests, [flakiness_server])), |
| 128 | 128 |
| 129 # Other waterfalls | 129 # Other waterfalls |
| 130 B('asan-builder-tests', H(compile_step, extra_gyp='asan=1'), | 130 B('asan-builder-tests', H(compile_step, extra_gyp='asan=1'), |
| 131 T(std_tests, ['--asan'])), | 131 T(std_tests, ['--asan'])), |
| 132 B('chromedriver-fyi-tests-dbg', H(std_test_steps), | 132 B('chromedriver-fyi-tests-dbg', H(std_test_steps), |
| 133 T(['chromedriver'], ['--install=ChromiumTestShell'])), | 133 T(['chromedriver'], ['--install=ChromiumTestShell'])), |
| 134 B('x86-builder-dbg', | |
| 135 H(std_build_steps + std_host_tests, target_arch='x86')), | |
|
Isaac (away)
2013/06/27 10:21:59
See comments in other CL -- unless there's a lot o
Siva Chandra
2013/06/27 18:53:17
I have compile_step instead of std_build_steps now
| |
| 134 B('fyi-builder-dbg', | 136 B('fyi-builder-dbg', |
| 135 H(std_build_steps + std_host_tests, ['--experimental'])), | 137 H(std_build_steps + std_host_tests, ['--experimental'])), |
| 136 B('fyi-builder-rel', H(std_build_steps, ['--experimental'])), | 138 B('fyi-builder-rel', H(std_build_steps, ['--experimental'])), |
| 137 B('fyi-tests-dbg-ics-gn', H(compile_step, [ '--experimental']), | 139 B('fyi-tests-dbg-ics-gn', H(compile_step, [ '--experimental']), |
| 138 T(std_tests, ['--experimental', flakiness_server])), | 140 T(std_tests, ['--experimental', flakiness_server])), |
| 139 B('fyi-tests', H(std_test_steps), | 141 B('fyi-tests', H(std_test_steps), |
| 140 T(std_tests, ['--experimental', flakiness_server])), | 142 T(std_tests, ['--experimental', flakiness_server])), |
| 141 B('fyi-component-builder-tests-dbg', | 143 B('fyi-component-builder-tests-dbg', |
| 142 H(compile_step, extra_gyp='component=shared_library'), | 144 H(compile_step, extra_gyp='component=shared_library'), |
| 143 T(std_tests, ['--experimental', flakiness_server])), | 145 T(std_tests, ['--experimental', flakiness_server])), |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 225 sys.stdout.flush() | 227 sys.stdout.flush() |
| 226 if options.testing: | 228 if options.testing: |
| 227 env['BUILDBOT_TESTING'] = '1' | 229 env['BUILDBOT_TESTING'] = '1' |
| 228 return_code = subprocess.call(command, cwd=bb_utils.CHROME_SRC, env=env) | 230 return_code = subprocess.call(command, cwd=bb_utils.CHROME_SRC, env=env) |
| 229 if return_code != 0: | 231 if return_code != 0: |
| 230 return return_code | 232 return return_code |
| 231 | 233 |
| 232 | 234 |
| 233 if __name__ == '__main__': | 235 if __name__ == '__main__': |
| 234 sys.exit(main(sys.argv)) | 236 sys.exit(main(sys.argv)) |
| OLD | NEW |