Revert "Update GoogleTest to v1.14.0 (llvm#65823)"

This reverts commit 54c1a9b.
It breaks a few llvm bots.

Author: zeroomega

clang/unittests/AST/ASTImporterODRStrategiesTest.cpp

@@ -599,8 +599,6 @@ ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
 INSTANTIATE_TEST_SUITE_P(
     ODRViolationTests, FunctionConservative,
     DefaultTestValuesForRunOptions );
-#else
-GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FunctionConservative);
 #endif
 INSTANTIATE_TEST_SUITE_P(
     ODRViolationTests, TypedefConservative,
@@ -633,8 +631,6 @@ INSTANTIATE_TEST_SUITE_P(
 //INSTANTIATE_TEST_SUITE_P(
     //ODRViolationTests, VarTemplateConservative,
     //DefaultTestValuesForRunOptions);
-GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VarTemplateConservative);
-
 INSTANTIATE_TEST_SUITE_P(
     ODRViolationTests, FunctionTemplateSpecConservative,
     DefaultTestValuesForRunOptions);
@@ -645,15 +641,12 @@ INSTANTIATE_TEST_SUITE_P(
 //INSTANTIATE_TEST_SUITE_P(
     //ODRViolationTests, VarTemplateSpecConservative,
     //DefaultTestValuesForRunOptions);
-GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VarTemplateSpecConservative);
 
 // FIXME: These fail on Windows.
 #if !defined(_WIN32)
 INSTANTIATE_TEST_SUITE_P(
     ODRViolationTests, FunctionLiberal,
     DefaultTestValuesForRunOptions);
-#else
-GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FunctionLiberal);
 #endif
 INSTANTIATE_TEST_SUITE_P(
     ODRViolationTests, TypedefLiberal,
@@ -686,8 +679,6 @@ INSTANTIATE_TEST_SUITE_P(
 // INSTANTIATE_TEST_SUITE_P(
 //     ODRViolationTests, VarTemplateLiberal,
 //     DefaultTestValuesForRunOptions);
-GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VarTemplateLiberal);
-
 INSTANTIATE_TEST_SUITE_P(
     ODRViolationTests, ClassTemplateSpecLiberal,
     DefaultTestValuesForRunOptions);
@@ -698,7 +689,6 @@ INSTANTIATE_TEST_SUITE_P(
 //INSTANTIATE_TEST_SUITE_P(
     //ODRViolationTests, VarTemplateSpecLiberal,
     //DefaultTestValuesForRunOptions );
-GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VarTemplateSpecLiberal);
 
 // clang-format on
 

clang/unittests/AST/ASTImporterTest.cpp

@@ -9227,13 +9227,5 @@ INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportAttributes,
 INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportInjectedClassNameType,
                          DefaultTestValuesForRunOptions);
 
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportMatrixType,
-                         DefaultTestValuesForRunOptions);
-
-// FIXME: Make ImportOpenCLPipe test work.
-// INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportOpenCLPipe,
-//                          DefaultTestValuesForRunOptions);
-GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ImportOpenCLPipe);
-
 } // end namespace ast_matchers
 } // end namespace clang

third-party/unittest/googlemock/README.LLVM

@@ -1,7 +1,7 @@
 LLVM notes
 ----------
 
-This directory contains the 'googlemock' component of Google Test 1.14.0, with
+This directory contains the 'googlemock' component of Google Test 1.10.0, with
 all elements removed except for the actual source code, to minimize the
 addition to the LLVM distribution.
 
@@ -10,10 +10,14 @@ Cleaned up as follows:
 # Remove all the unnecessary files and directories
 $ rm -f CMakeLists.txt configure* Makefile* CHANGES CONTRIBUTORS README README.md .gitignore
 $ rm -rf build-aux make msvc scripts test docs
+$ rm -f `find . -name \*\.pump`
 $ rm -f src/gmock_main.cc
 
 # Put the license in the consistent place for LLVM.
 $ mv LICENSE LICENSE.TXT
 
 Modified as follows:
 * Support for std::begin/std::end in gmock-matchers.h
+* IWYU pragmas
+* Disabled -Wdeprecated-copy for clang
+* Added IWYU pragmas from https://github.com/google/googletest/commit/100f6fbf5f81a82d163c1e29735e8a2936eacd4f