[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..ed4c4366531a532b4a098230366be5657cfc526d 100644
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -288,6 +288,8 @@ class GtestTestInstance(test_instance.TestInstance):
     else:
       self._gtest_filter = None
 
+    self._run_disabled = args.run_disabled
+
     self._data_deps_delegate = data_deps_delegate
     self._runtime_deps_path = args.runtime_deps_path
     if not self._runtime_deps_path:
@@ -342,6 +344,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
 
@@ -410,8 +416,8 @@ class GtestTestInstance(test_instance.TestInstance):
     Returns:
       A filtered list of tests to run.
     """
-    gtest_filter_strings = [
-        self._GenerateDisabledFilterString(disabled_prefixes)]
+    gtest_filter_strings = [self._GenerateDisabledFilterString(
+        disabled_prefixes, self.gtest_also_run_disabled_tests)]
     if self._gtest_filter:
       gtest_filter_strings.append(self._gtest_filter)
 
@@ -425,11 +431,18 @@ 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):

[jbudorick, 2016/11/30 23:17:11]

Sorry, I should've made my comment about passing in run_disabled here. Does this
need to be passed in, or can we use it directly?

[shenghuazhang, 2016/11/30 23:52:44]

Oh no we don't need to pass this... Will use the arg directly.

     disabled_filter_items = []
 
     if disabled_prefixes is None:
       disabled_prefixes = ['DISABLED_', 'FLAKY_', 'FAILS_', 'PRE_', 'MANUAL_']
+    if run_disabled:

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

When 'disabled_prefixes' is an non-empty input, could delete 'DISABLED_' and
'FLAKY_' as well.

[jbudorick, 2016/11/30 23:17:11]

This is a bit more complex than just appending them to the end of the list if
run_disabled isn't set.

[shenghuazhang, 2016/11/30 23:52:44]

But it didn't consider to remove the inputted disabled_prefixes I think. When
the 'disabled_prefixes' argument is passed in as e.g. disabled_prefixes =
['DISABLED_', 'FLAKY_', ...], and when run_disabled is set to true, the prefixes
'DISABLED_' and 'FLAKY_' won't be removed by that way?

[jbudorick, 2016/11/30 23:54:14]

That's a fair point, and I hadn't considered it. That option isn't used (any
more?), though, so I think we can ignore that case.

[shenghuazhang, 2016/12/01 00:39:56]

OK that make sense. Will refactor it with appending way in next patch.

+      if 'DISABLED_' in disabled_prefixes:
+        disabled_prefixes.remove('DISABLED_')
+      if 'FLAKY_' in disabled_prefixes:
+        disabled_prefixes.remove('FLAKY_')
+
     disabled_filter_items += ['%s*' % dp for dp in disabled_prefixes]
     disabled_filter_items += ['*.%s*' % dp for dp in disabled_prefixes]