| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 group.add_argument('-e', '--environment', default='local', | 97 group.add_argument('-e', '--environment', default='local', |
| 98 choices=constants.VALID_ENVIRONMENTS, | 98 choices=constants.VALID_ENVIRONMENTS, |
| 99 help='Test environment to run in (default: %(default)s).') | 99 help='Test environment to run in (default: %(default)s).') |
| 100 group.add_argument('--adb-path', type=os.path.abspath, | 100 group.add_argument('--adb-path', type=os.path.abspath, |
| 101 help=('Specify the absolute path of the adb binary that ' | 101 help=('Specify the absolute path of the adb binary that ' |
| 102 'should be used.')) | 102 'should be used.')) |
| 103 group.add_argument('--json-results-file', '--test-launcher-summary-output', | 103 group.add_argument('--json-results-file', '--test-launcher-summary-output', |
| 104 dest='json_results_file', | 104 dest='json_results_file', |
| 105 help='If set, will dump results in JSON form ' | 105 help='If set, will dump results in JSON form ' |
| 106 'to specified file.') | 106 'to specified file.') |
| 107 group.add_argument('--logdog-command', |
| 108 help='Command that will run the logdog butler') |
| 109 group.add_argument('--logdog-stream', |
| 110 help='Added arguments for using logdog streaming') |
| 107 | 111 |
| 108 logcat_output_group = group.add_mutually_exclusive_group() | 112 logcat_output_group = group.add_mutually_exclusive_group() |
| 109 logcat_output_group.add_argument( | 113 logcat_output_group.add_argument( |
| 110 '--logcat-output-dir', | 114 '--logcat-output-dir', |
| 111 help='If set, will dump logcats recorded during test run to directory. ' | 115 help='If set, will dump logcats recorded during test run to directory. ' |
| 112 'File names will be the device ids with timestamps.') | 116 'File names will be the device ids with timestamps.') |
| 113 logcat_output_group.add_argument( | 117 logcat_output_group.add_argument( |
| 114 '--logcat-output-file', | 118 '--logcat-output-file', |
| 115 help='If set, will merge logcats recorded during test run and dump them ' | 119 help='If set, will merge logcats recorded during test run and dump them ' |
| 116 'to the specified file.') | 120 'to the specified file.') |
| (...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 974 if e.is_infra_error: | 978 if e.is_infra_error: |
| 975 return constants.INFRA_EXIT_CODE | 979 return constants.INFRA_EXIT_CODE |
| 976 return constants.ERROR_EXIT_CODE | 980 return constants.ERROR_EXIT_CODE |
| 977 except: # pylint: disable=W0702 | 981 except: # pylint: disable=W0702 |
| 978 logging.exception('Unrecognized error occurred.') | 982 logging.exception('Unrecognized error occurred.') |
| 979 return constants.ERROR_EXIT_CODE | 983 return constants.ERROR_EXIT_CODE |
| 980 | 984 |
| 981 | 985 |
| 982 if __name__ == '__main__': | 986 if __name__ == '__main__': |
| 983 sys.exit(main()) | 987 sys.exit(main()) |
| OLD | NEW |