Merge remote branch 'cros/upstream' into master

client/bin/autotest

 #!/usr/bin/python -u
 #
 # autotest <control file> - run the autotest control file specified.
 #
 import os, sys
 import common
 from optparse import OptionParser
 from autotest_lib.client.bin import job
 from autotest_lib.client.common_lib import global_config
 
@@ skipping 38 matching lines @@
 
 parser.add_option('--hostname', dest='hostname', type='string',
                   default=None, action='store',
                   help='Take this as the hostname of this machine '
                        '(given by autoserv)')
 
 parser.add_option('--client_test_setup', dest='client_test_setup',
                   type='string', default=None, action='store',
                   help='a comma seperated list of client tests to prebuild on '
                        'the server. Use all to prebuild all of them.')
+
+parser.add_option('--tap', dest='tap_report', action='store_true',
+                  default=None, help='Output TAP (Test anything '
+                  'protocol) reports')
+
 def usage():
     parser.print_help()
     sys.exit(1)
 
 options, args = parser.parse_args()
 
 # Check for a control file if not in prebuild mode.
 if len(args) != 1 and options.client_test_setup is None:
     usage()
 
 drop_caches = global_config.global_config.get_config_value('CLIENT',
                                                            'drop_caches',
                                                            type=bool,
                                                            default=True)
 
 if options.client_test_setup:
     from autotest_lib.client.bin import setup_job
     exit_code = 0
     try:
         setup_job.setup_tests(options)
     except:
         exit_code = 1
     sys.exit(exit_code)
 
 # JOB: run the specified job control file.
 job.runjob(os.path.realpath(args[0]), drop_caches, options)