[Android] Add '--gtest_also_run_disabled_tests' for instrumentation tests

build/android/pylib/instrumentation/instrumentation_test_instance.py

 # Copyright 2015 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.
 
 import collections
 import copy
 import logging
 import os
 import pickle
 import re
@@ skipping 424 matching lines @@
 
     self._timeout_scale = None
     self._initializeTestControlAttributes(args)
 
     self._coverage_directory = None
     self._initializeTestCoverageAttributes(args)
 
     self._store_tombstones = False
     self._initializeTombstonesAttributes(args)
 
+    self._run_disabled = False
+
   def _initializeApkAttributes(self, args, error_func):
     if args.apk_under_test:
       apk_under_test_path = args.apk_under_test
       if not args.apk_under_test.endswith('.apk'):
         apk_under_test_path = os.path.join(
             constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR,
             '%s.apk' % args.apk_under_test)
 
       # TODO(jbudorick): Move the realpath up to the argument parser once
       # APK-by-name is no longer supported.
@@ skipping 67 matching lines @@
     self._runtime_deps_path = args.runtime_deps_path
 
     if not self._runtime_deps_path:
       logging.warning('No data dependencies will be pushed.')
 
   def _initializeTestFilterAttributes(self, args):
     if args.test_filter:
       self._test_filter = _CMDLINE_NAME_SEGMENT_RE.sub(
           '', args.test_filter.replace('#', '.'))
 
+    self._run_disabled = args.run_disabled
+
     def annotation_element(a):
       a = a.split('=', 1)
       return (a[0], a[1] if len(a) == 2 else None)
 
     if args.annotation_str:
       self._annotations = [
           annotation_element(a) for a in args.annotation_str.split(',')]
     elif not self._test_filter:
       self._annotations = [
           annotation_element(a) for a in _DEFAULT_ANNOTATIONS]
     else:
       self._annotations = []
 
     if args.exclude_annotation_str:
       self._excluded_annotations = [
           annotation_element(a) for a in args.exclude_annotation_str.split(',')]
     else:
       self._excluded_annotations = []
 
     requested_annotations = set(a[0] for a in self._annotations)
-    self._excluded_annotations.extend(
-        annotation_element(a) for a in _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS
-        if a not in requested_annotations)
+    if not self._run_disabled:

[jbudorick, 2016/12/02 02:19:35]

Without the property, we should be able to use args.run_disabled directly here.

+      self._excluded_annotations.extend(
+          annotation_element(a) for a in _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS
+          if a not in requested_annotations)
 
   def _initializeFlagAttributes(self, args):
     self._flags = ['--enable-test-intents']
     # TODO(jbudorick): Transition "--device-flags" to "--device-flags-file"
     if hasattr(args, 'device_flags') and args.device_flags:
       with open(args.device_flags) as device_flags_file:
         stripped_lines = (l.strip() for l in device_flags_file)
         self._flags.extend([flag for flag in stripped_lines if flag])
     if hasattr(args, 'device_flags_file') and args.device_flags_file:
       with open(args.device_flags_file) as device_flags_file:
@@ skipping 53 matching lines @@
 
   @property
   def driver_name(self):
     return self._driver_name
 
   @property
   def flags(self):
     return self._flags
 
   @property
+  def gtest_also_run_disabled_tests(self):

[jbudorick, 2016/12/02 02:19:35]

If this isn't used, don't add it. We can add it when we need it.

[shenghuazhang, 2016/12/02 02:25:40]

Done.

+    return self._run_disabled
+
+  @property
   def package_info(self):
     return self._package_info
 
   @property
   def screenshot_dir(self):
     return self._screenshot_dir
 
   @property
   def store_tombstones(self):
     return self._store_tombstones
@@ skipping 103 matching lines @@
 
   @staticmethod
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
   #override
   def TearDown(self):
     pass