Exclude tests prefixed with FLAKY, FAILS, DISABLED and MAYBE.

Review URL: https://chromiumcodereview.appspot.com/11411012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168024 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 21 deletions

diff --git a/tools/code_coverage/coverage_posix.py b/tools/code_coverage/coverage_posix.py
index 6e3438a..9b4d448 100755
--- a/tools/code_coverage/coverage_posix.py
+++ b/tools/code_coverage/coverage_posix.py
@@ -244,18 +244,6 @@ gTestExclusions = {
          'AutomatedUITestBase.DragOut',), },
 }
 
-gTestInclusions = {
-  'linux2': {
-    'browser_tests':
-        ('DownloadTest.*',
-         'SavePageBrowserTest.*',
-         'BrowserCloseTest.*',
-         'DownloadsApiTest.*',
-         'MHTMLGenerationTest.*',),
-  },
-}
-
-
 
 def TerminateSignalHandler(sig, stack):
   """When killed, try and kill our child processes."""
@@ -781,8 +769,10 @@ class Coverage(object):
     positive_gfilter_list = []
     negative_gfilter_list = []
 
-    # Run all tests including flaky tests to get the overall coverage.
-    negative_gfilter_list += ['*.FAILS_*']
+    # Exclude all flaky, failing, disabled and maybe tests;
+    # they don't count for code coverage.
+    negative_gfilter_list += ('*.FLAKY_*', '*.FAILS_*',
+                              '*.DISABLED_*', '*.MAYBE_*')
 
     if not self.options.no_exclusions:
       exclusions = excl or gTestExclusions
@@ -793,13 +783,6 @@ class Coverage(object):
           if test in fulltest:
             negative_gfilter_list += excldict[test]
 
-    inclusions = gTestInclusions
-    includedict = inclusions.get(sys.platform)
-    if includedict:
-        for test in includedict.keys():
-          if test in fulltest:
-            positive_gfilter_list += includedict[test]
-
     fulltest_basename = os.path.basename(fulltest)
     if fulltest_basename in self.test_filters:
       specific_test_filters = self.test_filters[fulltest_basename].split('-')