| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright 2013 The Chromium Authors. All rights reserved. | 3 # Copyright 2013 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 all types of tests from one unified interface.""" | 7 """Runs all types of tests from one unified interface.""" |
| 8 | 8 |
| 9 import argparse | 9 import argparse |
| 10 import collections | 10 import collections |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 def ProcessJavaTestOptions(args): | 355 def ProcessJavaTestOptions(args): |
| 356 """Processes options/arguments and populates |options| with defaults.""" | 356 """Processes options/arguments and populates |options| with defaults.""" |
| 357 | 357 |
| 358 # TODO(jbudorick): Handle most of this function in argparse. | 358 # TODO(jbudorick): Handle most of this function in argparse. |
| 359 if args.annotation_str: | 359 if args.annotation_str: |
| 360 args.annotations = args.annotation_str.split(',') | 360 args.annotations = args.annotation_str.split(',') |
| 361 elif args.test_filter: | 361 elif args.test_filter: |
| 362 args.annotations = [] | 362 args.annotations = [] |
| 363 else: | 363 else: |
| 364 args.annotations = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest', | 364 args.annotations = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest', |
| 365 'EnormousTest', 'IntegrationTest'] | 365 'EnormousTest', 'IntegrationTest', 'RenderTest'] |
| 366 | 366 |
| 367 if args.exclude_annotation_str: | 367 if args.exclude_annotation_str: |
| 368 args.exclude_annotations = args.exclude_annotation_str.split(',') | 368 args.exclude_annotations = args.exclude_annotation_str.split(',') |
| 369 else: | 369 else: |
| 370 args.exclude_annotations = [] | 370 args.exclude_annotations = [] |
| 371 | 371 |
| 372 | 372 |
| 373 def AddInstrumentationTestOptions(parser): | 373 def AddInstrumentationTestOptions(parser): |
| 374 """Adds Instrumentation test options to |parser|.""" | 374 """Adds Instrumentation test options to |parser|.""" |
| 375 | 375 |
| (...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 981 if e.is_infra_error: | 981 if e.is_infra_error: |
| 982 return constants.INFRA_EXIT_CODE | 982 return constants.INFRA_EXIT_CODE |
| 983 return constants.ERROR_EXIT_CODE | 983 return constants.ERROR_EXIT_CODE |
| 984 except: # pylint: disable=W0702 | 984 except: # pylint: disable=W0702 |
| 985 logging.exception('Unrecognized error occurred.') | 985 logging.exception('Unrecognized error occurred.') |
| 986 return constants.ERROR_EXIT_CODE | 986 return constants.ERROR_EXIT_CODE |
| 987 | 987 |
| 988 | 988 |
| 989 if __name__ == '__main__': | 989 if __name__ == '__main__': |
| 990 sys.exit(main()) | 990 sys.exit(main()) |
| OLD | NEW |