Fix ValidateInstrumentationOptions.

build/android/pylib/test_options_parser.py

 # Copyright (c) 2012 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.
 
 """Parses options for the instrumentation tests."""
 
 import constants
 import optparse
 import os
+import sys
 
 _SDK_OUT_DIR = os.path.join(constants.CHROME_DIR, 'out')
 
 
 def AddBuildTypeOption(option_parser):
   """Decorates OptionParser with build type option."""
   default_build_type = 'Debug'
   if 'BUILDTYPE' in os.environ:
     default_build_type = os.environ['BUILDTYPE']
   option_parser.add_option('--debug', action='store_const', const='Debug',
@@ skipping 75 matching lines @@
                            help='Saves the JSON file for each UI Perf test.')
   option_parser.add_option('--shard_retries', type=int, default=1,
                            help=('Number of times to retry each failure when '
                                  'sharding.'))
   option_parser.add_option('--official-build', help='Run official build tests.')
   option_parser.add_option('--device',
                            help='Serial number of device we should use.')
   option_parser.add_option('--python_test_root',
                            help='Root of the python-driven tests.')
 
-def ValidateInstrumentationOptions(options, args):
+def ValidateInstrumentationOptions(option_parser, options, args):
   """Validate options/arguments and populate options with defaults."""
   if len(args) > 1:
-    option_parser.error('Unknown argument:', args[1:])
+    option_parser.print_help(sys.stderr)
+    option_parser.error('Unknown arguments: %s' % args[1:])
   if options.java_only and options.python_only:
     option_parser.error('Options java_only (-j) and python_only (-p) '
-                        'are mutually exclusive')
+                        'are mutually exclusive.')
 
   options.run_java_tests = True
   options.run_python_tests = True
   if options.java_only:
     options.run_python_tests = False
   elif options.python_only:
     options.run_java_tests = False
 
   options.test_apk_path = os.path.join(_SDK_OUT_DIR,
                                        options.build_type,
                                        '%s.apk' % options.test_apk)
   options.test_apk_jar_path = os.path.join(_SDK_OUT_DIR,
                                            options.build_type,
                                            '%s.jar'
                                            % options.test_apk)
   if options.annotation_str:
     options.annotation = options.annotation_str.split()
   elif options.test_filter:
     options.annotation = []
   else:
     options.annotation = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest']
-