Add option to exclude specific annotated Android instrumentation tests.

build/android/pylib/utils/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."""
 
 #TODO(craigdh): pylib/utils/ should not depend on pylib/.
 from pylib import constants
 
 import optparse
@@ skipping 126 matching lines @@
   AddTestRunnerOptions(option_parser)
   option_parser.add_option('-f', '--test_filter',
                            help='Test filter (if not fully qualified, '
                            'will run all matches).')
   option_parser.add_option(
       '-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".'))
+  option_parser.add_option(
+      '-E', '--exclude-annotation', dest='exclude_annotation_str',
+      help=('Comma-separated list of annotations. Exclude tests with these '
+            'annotations.'))
   option_parser.add_option('-j', '--java_only', action='store_true',
                            help='Run only the Java tests.')
   option_parser.add_option('-p', '--python_only', action='store_true',
                            help='Run only the Python tests.')
   option_parser.add_option('--screenshot', dest='screenshot_failures',
                            action='store_true',
                            help='Capture screenshots of test failures')
   option_parser.add_option('--save-perf-json', action='store_true',
                            help='Saves the JSON file for each UI Perf test.')
   option_parser.add_option('--shard_retries', type=int, default=1,
@@ skipping 72 matching lines @@
   elif options.python_only:
     options.run_java_tests = False
 
   if options.annotation_str:
     options.annotations = options.annotation_str.split(',')
   elif options.test_filter:
     options.annotations = []
   else:
     options.annotations = ['Smoke', 'SmallTest', 'MediumTest', 'LargeTest']
 
+  if options.exclude_annotation_str:
+    options.exclude_annotations = options.exclude_annotation_str.split(',')
+  else:
+    options.exclude_annotations = []
+
 
 def ValidateInstrumentationOptions(option_parser, options, args):
   """Validate options/arguments and populate options with defaults."""
   ValidateCommonInstrumentationOptions(option_parser, options, args)
 
   if not options.test_apk:
     option_parser.error('--test-apk must be specified.')
 
   if os.path.exists(options.test_apk):
     # The APK is fully qualified, assume the JAR lives along side.
@@ skipping 24 matching lines @@
     # The dexed JAR is fully qualified, assume the info JAR lives along side.
     options.uiautomator_jar = options.test_jar
   else:
     options.uiautomator_jar = os.path.join(
         _SDK_OUT_DIR, options.build_type, constants.SDK_BUILD_JAVALIB_DIR,
         '%s.dex.jar' % options.test_jar)
   options.uiautomator_info_jar = (
       options.uiautomator_jar[:options.uiautomator_jar.find('.dex.jar')] +
       '_java.jar')