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 17 matching lines @@
 
 parser.add_option("-c", "--continue", dest="cont", action="store_true",
                         default=False, help="continue previously started job")
 
 parser.add_option("-t", "--tag", dest="tag", type="string", default="default",
                         help="set the job tag")
 
 parser.add_option("-H", "--harness", dest="harness", type="string", default='',
                         help="set the harness type")
 
+parser.add_option("-P", "--harness_args", dest="harness_args", type="string", default='',
+                        help="arguments delivered to harness")
+
 parser.add_option("-U", "--user", dest="user", type="string",
                         default='', help="set the job username")
 
 parser.add_option("-l", "--external_logging", dest="log", action="store_true",
                         default=False, help="enable external logging")
 
 parser.add_option('--verbose', dest='verbose', action='store_true',
                   help='Include DEBUG messages in console output')
 
 parser.add_option('--quiet', dest='verbose', action='store_false',
@@ skipping 32 matching lines @@
     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)