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 os | 10 import os |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 | 66 |
67 | 67 |
68 def main(argv): | 68 def main(argv): |
69 option_parser = optparse.OptionParser() | 69 option_parser = optparse.OptionParser() |
70 test_options_parser.AddInstrumentationOptions(option_parser) | 70 test_options_parser.AddInstrumentationOptions(option_parser) |
71 options, args = option_parser.parse_args(argv) | 71 options, args = option_parser.parse_args(argv) |
72 test_options_parser.ValidateInstrumentationOptions(option_parser, options, | 72 test_options_parser.ValidateInstrumentationOptions(option_parser, options, |
73 args) | 73 args) |
74 | 74 |
75 run_tests_helper.SetLogLevel(options.verbose_count) | 75 run_tests_helper.SetLogLevel(options.verbose_count) |
76 buildbot_report.PrintNamedStep( | |
77 'Instrumentation tests: %s - %s' % (', '.join(options.annotation), | |
78 options.test_apk)) | |
79 ret = 1 | 76 ret = 1 |
80 try: | 77 try: |
81 ret = DispatchInstrumentationTests(options) | 78 ret = DispatchInstrumentationTests(options) |
82 finally: | 79 finally: |
83 buildbot_report.PrintStepResultIfNeeded(options, ret) | 80 buildbot_report.PrintStepResultIfNeeded(options, ret) |
84 return ret | 81 return ret |
85 | 82 |
86 | 83 |
87 if __name__ == '__main__': | 84 if __name__ == '__main__': |
88 sys.exit(main(sys.argv)) | 85 sys.exit(main(sys.argv)) |
OLD | NEW |