Record screenshots on failures on swarming bots.

build/android/test_runner.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs all types of tests from one unified interface."""
 
 import argparse
 import collections
@@ skipping 97 matching lines @@
                            'should be used.'))
   group.add_argument('--json-results-file', '--test-launcher-summary-output',
                      dest='json_results_file', type=os.path.realpath,
                      help='If set, will dump results in JSON form '
                           'to specified file.')
   group.add_argument('--trace-output', metavar='FILENAME',
                      type=os.path.realpath,
                      help='Path to save test_runner trace data to. This option '
                           'has been implemented for gtest, instrumentation '
                           'test and perf test.')
+  group.add_argument(

[jbudorick, 2017/03/01 20:19:21]

Why is this moving to the generic arguments when it's only supported for
instrumentation tests?

+      '--screenshot-directory', dest='screenshot_dir', type=os.path.realpath,
+      help='Capture screenshots of test failures')
 
   logcat_output_group = group.add_mutually_exclusive_group()
   logcat_output_group.add_argument(
       '--logcat-output-dir', type=os.path.realpath,
       help='If set, will dump logcats recorded during test run to directory. '
            'File names will be the device ids with timestamps.')
   logcat_output_group.add_argument(
       '--logcat-output-file', type=os.path.realpath,
       help='If set, will merge logcats recorded during test run and dump them '
            'to the specified file.')
@@ skipping 151 matching lines @@
       '-A', '--annotation', dest='annotation_str',
       help=('Comma-separated list of annotations. Run only tests with any of '
             'the given annotations. An annotation can be either a key or a '
             'key-values pair. A test that has no annotation is considered '
             '"SmallTest".'))
   argument_group.add_argument(
       '-E', '--exclude-annotation', dest='exclude_annotation_str',
       help=('Comma-separated list of annotations. Exclude tests with these '
             'annotations.'))
   argument_group.add_argument(
-      '--screenshot-directory', dest='screenshot_dir', type=os.path.realpath,
-      help='Capture screenshots of test failures')
-  argument_group.add_argument(
       '--save-perf-json', action='store_true',
       help='Saves the JSON file for each UI Perf test.')
   argument_group.add_argument(
       '--official-build', action='store_true', help='Run official build tests.')
   argument_group.add_argument(
       '--disable-dalvik-asserts', dest='set_asserts', action='store_false',
       default=True, help='Removes the dalvik.vm.enableassertions property')
   argument_group.add_argument(
       '--gtest_also_run_disabled_tests', '--gtest-also-run-disabled-tests',
       dest='run_disabled', action='store_true',
@@ skipping 551 matching lines @@
     if e.is_infra_error:
       return constants.INFRA_EXIT_CODE
     return constants.ERROR_EXIT_CODE
   except: # pylint: disable=W0702
     logging.exception('Unrecognized error occurred.')
     return constants.ERROR_EXIT_CODE
 
 
 if __name__ == '__main__':
   sys.exit(main())