| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 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 """Runs both the Python and Java tests.""" | 7 """Runs both the Python and Java tests.""" |
| 8 | 8 |
| 9 import optparse | 9 import optparse |
| 10 import sys | 10 import sys |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 | 70 |
| 71 | 71 |
| 72 def main(argv): | 72 def main(argv): |
| 73 option_parser = optparse.OptionParser() | 73 option_parser = optparse.OptionParser() |
| 74 test_options_parser.AddInstrumentationOptions(option_parser) | 74 test_options_parser.AddInstrumentationOptions(option_parser) |
| 75 options, args = option_parser.parse_args(argv) | 75 options, args = option_parser.parse_args(argv) |
| 76 test_options_parser.ValidateInstrumentationOptions(option_parser, options, | 76 test_options_parser.ValidateInstrumentationOptions(option_parser, options, |
| 77 args) | 77 args) |
| 78 | 78 |
| 79 run_tests_helper.SetLogLevel(options.verbose_count) | 79 run_tests_helper.SetLogLevel(options.verbose_count) |
| 80 buildbot_report.PrintNamedStep('Instrumentation tests: %s' | 80 buildbot_report.PrintNamedStep( |
| 81 % ', '.join(options.annotation)) | 81 'Instrumentation tests: %s - %s' % (', '.join(options.annotation), |
| 82 options.test_apk)) |
| 82 return DispatchInstrumentationTests(options) | 83 return DispatchInstrumentationTests(options) |
| 83 | 84 |
| 84 | 85 |
| 85 if __name__ == '__main__': | 86 if __name__ == '__main__': |
| 86 sys.exit(main(sys.argv)) | 87 sys.exit(main(sys.argv)) |
| OLD | NEW |