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

base/test/gtest_util.cc

 // Copyright 2014 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/gtest_util.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
+#include "base/strings/string_util.h"
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 TestIdentifier::TestIdentifier() {
 }
 
 TestIdentifier::TestIdentifier(const TestIdentifier& other) = default;
 
 std::string FormatFullTestName(const std::string& test_case_name,
                                const std::string& test_name) {
   return test_case_name + "." + test_name;
 }
 
+std::string NormalizeTestName(const std::string& full_test_name) {
+  std::string test_name_no_disabled(full_test_name);
+  ReplaceSubstringsAfterOffset(&test_name_no_disabled, 0, "DISABLED_", "");

[stgao, 2016/10/24 21:48:23]

For test A.B, if A or B matches either "DISABLED_*" or "*/DISABLED_*", A.B is
treated as a disabled test.

Do we want to do the same here? Do we really care about test names like
"AnEnabledTest.ButTestWithDISABLED_Feature"?

[Paweł Hajdan Jr., 2016/10/25 18:16:59]

The code is fine. It matches existing implementation of
TestNameWithoutDisabledPrefix .

[stgao, 2016/10/25 19:16:49]

Acknowledged.

+  return test_name_no_disabled;
+}
+
 std::vector<TestIdentifier> GetCompiledInTests() {
   testing::UnitTest* const unit_test = testing::UnitTest::GetInstance();
 
   std::vector<TestIdentifier> tests;
   for (int i = 0; i < unit_test->total_test_case_count(); ++i) {
     const testing::TestCase* test_case = unit_test->GetTestCase(i);
     for (int j = 0; j < test_case->total_test_count(); ++j) {
       const testing::TestInfo* test_info = test_case->GetTestInfo(j);
       TestIdentifier test_data;
       test_data.test_case_name = test_case->name();
@@ skipping 58 matching lines @@
       return false;
 
     result.push_back(test_data);
   }
 
   output->swap(result);
   return true;
 }
 
 }  // namespace base