test launcher: make --gtest_filter=A.B + --gtest_also_run_disabled_tests also run A.DISABLED_B or D…

base/test/launcher/test_launcher.cc

 // Copyright 2013 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.
 
 #include "base/test/launcher/test_launcher.h"
 
 #include <memory>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 956 matching lines @@
     }
 
     if (!launcher_delegate_->ShouldRunTest(
         tests_[i].test_case_name, tests_[i].test_name)) {
       continue;
     }
 
     // Count tests in the binary, before we apply filter and sharding.
     test_found_count_++;
 
+    std::string test_name_no_disabled = TestNameWithoutDisabledPrefix(
+        test_name);
+
     // Skip the test that doesn't match the filter (if given).
     if (!positive_test_filter_.empty()) {
       bool found = false;
       for (size_t k = 0; k < positive_test_filter_.size(); ++k) {
-        if (MatchPattern(test_name, positive_test_filter_[k])) {
+        if (MatchPattern(test_name, positive_test_filter_[k]) ||
+            MatchPattern(test_name_no_disabled, positive_test_filter_[k])) {
           found = true;
           break;
         }
       }
 
       if (!found)
         continue;
     }
-    bool excluded = false;
-    for (size_t k = 0; k < negative_test_filter_.size(); ++k) {
-      if (MatchPattern(test_name, negative_test_filter_[k])) {
-        excluded = true;
-        break;
+    if (!negative_test_filter_.empty()) {
+      bool excluded = false;
+      for (size_t k = 0; k < negative_test_filter_.size(); ++k) {
+        if (MatchPattern(test_name, negative_test_filter_[k]) ||
+            MatchPattern(test_name_no_disabled, negative_test_filter_[k])) {
+          excluded = true;
+          break;
+        }
       }
+
+      if (excluded)
+        continue;
     }
-    if (excluded)
-      continue;
 
     if (Hash(test_name) % total_shards_ != static_cast<uint32_t>(shard_index_))
       continue;
 
     test_names.push_back(test_name);
   }
 
   // Save an early test summary in case the launcher crashes or gets killed.
   MaybeSaveSummaryAsJSON({"EARLY_SUMMARY", kUnreliableResultsTag});
 
@@ skipping 149 matching lines @@
   }
 
   std::string snippet(full_output.substr(run_pos));
   if (end_pos != std::string::npos)
     snippet = full_output.substr(run_pos, end_pos - run_pos);
 
   return snippet;
 }
 
 }  // namespace base