[Android] Add '--gtest_also_run_disabled_tests' logic in gtest runner

build/android/pylib/gtest/gtest_test_instance.py

Index: build/android/pylib/gtest/gtest_test_instance.py
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
index b7e7201a45c06af757fb6989665f50eab7889c3f..a57110a744a9028e6eef89944556c078335af520 100644
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -288,6 +288,11 @@ class GtestTestInstance(test_instance.TestInstance):
     else:
       self._gtest_filter = None
 
+    if args.run_disabled:

[jbudorick, 2016/11/30 21:05:56]

This can just be

  self._run_disabled = args.run_disabled

[shenghuazhang, 2016/11/30 21:58:01]

Done.

+      self._run_disabled = args.run_disabled
+    else:
+      self._run_disabled = False
+
     self._data_deps_delegate = data_deps_delegate
     self._runtime_deps_path = args.runtime_deps_path
     if not self._runtime_deps_path:
@@ -342,6 +347,10 @@ class GtestTestInstance(test_instance.TestInstance):
     return self._extras
 
   @property
+  def gtest_also_run_disabled_tests(self):
+    return self._run_disabled
+
+  @property
   def gtest_filter(self):
     return self._gtest_filter
 
@@ -400,7 +409,7 @@ class GtestTestInstance(test_instance.TestInstance):
     """
     return self._data_deps
 
-  def FilterTests(self, test_list, disabled_prefixes=None):
+  def FilterTests(self, test_list, disabled_prefixes=None, run_disabled=False):

[jbudorick, 2016/11/30 21:05:56]

Does this need to be exposed? Can this function just use
self.gtest_also_run_disabled_tests?

[shenghuazhang, 2016/11/30 21:58:01]

Done.

     """Filters |test_list| based on prefixes and, if present, a filter string.
 
     Args:
@@ -411,7 +420,7 @@ class GtestTestInstance(test_instance.TestInstance):
       A filtered list of tests to run.
     """
     gtest_filter_strings = [
-        self._GenerateDisabledFilterString(disabled_prefixes)]
+        self._GenerateDisabledFilterString(disabled_prefixes, run_disabled)]
     if self._gtest_filter:
       gtest_filter_strings.append(self._gtest_filter)
 
@@ -425,11 +434,16 @@ class GtestTestInstance(test_instance.TestInstance):
             filtered_test_list, gtest_filter_string)
     return filtered_test_list
 
-  def _GenerateDisabledFilterString(self, disabled_prefixes):
+  def _GenerateDisabledFilterString(self, disabled_prefixes,
+                                    run_disabled=False):
     disabled_filter_items = []
 
     if disabled_prefixes is None:
-      disabled_prefixes = ['DISABLED_', 'FLAKY_', 'FAILS_', 'PRE_', 'MANUAL_']
+      if run_disabled:

[jbudorick, 2016/11/30 21:05:56]

nit:

  disabled_prefixes = ['FAILS_', 'PRE_', 'MANUAL_']
  if not run_disabled:
    disabled_prefixes += ['DISABLED_', 'FLAKY_']

?

[shenghuazhang, 2016/11/30 21:58:01]

Done.

+        disabled_prefixes = ['FAILS_', 'PRE_', 'MANUAL_']
+      else:
+        disabled_prefixes = ['DISABLED_', 'FLAKY_', 'FAILS_', 'PRE_', 'MANUAL_']
+
     disabled_filter_items += ['%s*' % dp for dp in disabled_prefixes]
     disabled_filter_items += ['*.%s*' % dp for dp in disabled_prefixes]