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

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

Issue 11231076: Android: upstream latest changes for build/android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months 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 | « build/android/pylib/test_options_parser.py ('k') | 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 option_parser = optparse.OptionParser() 87 option_parser = optparse.OptionParser()
88 test_options_parser.AddInstrumentationOptions(option_parser) 88 test_options_parser.AddInstrumentationOptions(option_parser)
89 options, args = option_parser.parse_args(argv) 89 options, args = option_parser.parse_args(argv)
90 test_options_parser.ValidateInstrumentationOptions(option_parser, options, 90 test_options_parser.ValidateInstrumentationOptions(option_parser, options,
91 args) 91 args)
92 92
93 run_tests_helper.SetLogLevel(options.verbose_count) 93 run_tests_helper.SetLogLevel(options.verbose_count)
94 buildbot_report.PrintNamedStep( 94 buildbot_report.PrintNamedStep(
95 'Instrumentation tests: %s - %s' % (', '.join(options.annotation), 95 'Instrumentation tests: %s - %s' % (', '.join(options.annotation),
96 options.test_apk)) 96 options.test_apk))
97 return DispatchInstrumentationTests(options) 97 ret = DispatchInstrumentationTests(options)
98 buildbot_report.PrintStepResultIfNeeded(options, ret)
99 return ret
98 100
99 101
100 if __name__ == '__main__': 102 if __name__ == '__main__':
101 sys.exit(main(sys.argv)) 103 sys.exit(main(sys.argv))
OLDNEW
« no previous file with comments | « build/android/pylib/test_options_parser.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698