| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import collections | 6 import collections |
| 7 import glob | 7 import glob |
| 8 import json | 8 import json |
| 9 import multiprocessing | 9 import multiprocessing |
| 10 import optparse | 10 import optparse |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 def RunInstrumentationSuite(options, test): | 181 def RunInstrumentationSuite(options, test): |
| 182 """Manages an invocation of run_instrumentaiton_tests.py. | 182 """Manages an invocation of run_instrumentaiton_tests.py. |
| 183 | 183 |
| 184 Args: | 184 Args: |
| 185 options: options object | 185 options: options object |
| 186 test: An I_TEST namedtuple | 186 test: An I_TEST namedtuple |
| 187 """ | 187 """ |
| 188 buildbot_report.PrintNamedStep('%s_instrumentation_tests' % test.name.lower()) | 188 buildbot_report.PrintNamedStep('%s_instrumentation_tests' % test.name.lower()) |
| 189 | 189 |
| 190 InstallApk(options, test) | 190 InstallApk(options, test) |
| 191 args = ['--test-apk', test.test_apk, '--test_data', test.test_data, '-vvv', | 191 args = ['--test-apk', test.test_apk, '--test_data', test.test_data, |
| 192 '-I'] | 192 '--verbose', '-I'] |
| 193 if options.target == 'Release': | 193 if options.target == 'Release': |
| 194 args.append('--release') | 194 args.append('--release') |
| 195 if options.asan: | 195 if options.asan: |
| 196 args.append('--tool=asan') | 196 args.append('--tool=asan') |
| 197 if options.upload_to_flakiness_server: | 197 if options.upload_to_flakiness_server: |
| 198 args.append('--flakiness-dashboard-server=%s' % | 198 args.append('--flakiness-dashboard-server=%s' % |
| 199 constants.UPSTREAM_FLAKINESS_SERVER) | 199 constants.UPSTREAM_FLAKINESS_SERVER) |
| 200 if test.host_driven_root: | 200 if test.host_driven_root: |
| 201 args.append('--python_test_root=%s' % test.host_driven_root) | 201 args.append('--python_test_root=%s' % test.host_driven_root) |
| 202 | 202 |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 'slave', 'android')) | 368 'slave', 'android')) |
| 369 if os.path.exists(build_internal_android): | 369 if os.path.exists(build_internal_android): |
| 370 android_paths.insert(0, build_internal_android) | 370 android_paths.insert(0, build_internal_android) |
| 371 os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']]) | 371 os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']]) |
| 372 | 372 |
| 373 MainTestWrapper(options) | 373 MainTestWrapper(options) |
| 374 | 374 |
| 375 | 375 |
| 376 if __name__ == '__main__': | 376 if __name__ == '__main__': |
| 377 sys.exit(main(sys.argv)) | 377 sys.exit(main(sys.argv)) |
| OLD | NEW |