Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: build/android/run_instrumentation_tests.py

Issue 11421087: Android tests: Always run PrintStepResultIfNeeded (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 option_parser = optparse.OptionParser() 89 option_parser = optparse.OptionParser()
90 test_options_parser.AddInstrumentationOptions(option_parser) 90 test_options_parser.AddInstrumentationOptions(option_parser)
91 options, args = option_parser.parse_args(argv) 91 options, args = option_parser.parse_args(argv)
92 test_options_parser.ValidateInstrumentationOptions(option_parser, options, 92 test_options_parser.ValidateInstrumentationOptions(option_parser, options,
93 args) 93 args)
94 94
95 run_tests_helper.SetLogLevel(options.verbose_count) 95 run_tests_helper.SetLogLevel(options.verbose_count)
96 buildbot_report.PrintNamedStep( 96 buildbot_report.PrintNamedStep(
97 'Instrumentation tests: %s - %s' % (', '.join(options.annotation), 97 'Instrumentation tests: %s - %s' % (', '.join(options.annotation),
98 options.test_apk)) 98 options.test_apk))
99 ret = DispatchInstrumentationTests(options) 99 ret = 1
100 buildbot_report.PrintStepResultIfNeeded(options, ret) 100 try:
101 ret = DispatchInstrumentationTests(options)
102 finally:
103 buildbot_report.PrintStepResultIfNeeded(options, ret)
101 return ret 104 return ret
102 105
103 106
104 if __name__ == '__main__': 107 if __name__ == '__main__':
105 sys.exit(main(sys.argv)) 108 sys.exit(main(sys.argv))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698