Skip to content

Commit a866ce7

Browse files
committed
Reland "Update GoogleTest to v1.14.0 (#65823)"
This patch reland 54c1a9b, which updates GoogleTest to v1.14.0. This patch fixes bots failures caused by the early patch.
1 parent 3df9c29 commit a866ce7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+11995
-13509
lines changed

clang/unittests/AST/ASTImporterODRStrategiesTest.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,8 @@ ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
599599
INSTANTIATE_TEST_SUITE_P(
600600
ODRViolationTests, FunctionConservative,
601601
DefaultTestValuesForRunOptions );
602+
#else
603+
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FunctionConservative);
602604
#endif
603605
INSTANTIATE_TEST_SUITE_P(
604606
ODRViolationTests, TypedefConservative,
@@ -631,6 +633,8 @@ INSTANTIATE_TEST_SUITE_P(
631633
//INSTANTIATE_TEST_SUITE_P(
632634
//ODRViolationTests, VarTemplateConservative,
633635
//DefaultTestValuesForRunOptions);
636+
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VarTemplateConservative);
637+
634638
INSTANTIATE_TEST_SUITE_P(
635639
ODRViolationTests, FunctionTemplateSpecConservative,
636640
DefaultTestValuesForRunOptions);
@@ -641,12 +645,15 @@ INSTANTIATE_TEST_SUITE_P(
641645
//INSTANTIATE_TEST_SUITE_P(
642646
//ODRViolationTests, VarTemplateSpecConservative,
643647
//DefaultTestValuesForRunOptions);
648+
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VarTemplateSpecConservative);
644649

645650
// FIXME: These fail on Windows.
646651
#if !defined(_WIN32)
647652
INSTANTIATE_TEST_SUITE_P(
648653
ODRViolationTests, FunctionLiberal,
649654
DefaultTestValuesForRunOptions);
655+
#else
656+
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FunctionLiberal);
650657
#endif
651658
INSTANTIATE_TEST_SUITE_P(
652659
ODRViolationTests, TypedefLiberal,
@@ -679,6 +686,8 @@ INSTANTIATE_TEST_SUITE_P(
679686
// INSTANTIATE_TEST_SUITE_P(
680687
// ODRViolationTests, VarTemplateLiberal,
681688
// DefaultTestValuesForRunOptions);
689+
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VarTemplateLiberal);
690+
682691
INSTANTIATE_TEST_SUITE_P(
683692
ODRViolationTests, ClassTemplateSpecLiberal,
684693
DefaultTestValuesForRunOptions);
@@ -689,6 +698,7 @@ INSTANTIATE_TEST_SUITE_P(
689698
//INSTANTIATE_TEST_SUITE_P(
690699
//ODRViolationTests, VarTemplateSpecLiberal,
691700
//DefaultTestValuesForRunOptions );
701+
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VarTemplateSpecLiberal);
692702

693703
// clang-format on
694704

clang/unittests/AST/ASTImporterTest.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -9227,5 +9227,13 @@ INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportAttributes,
92279227
INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportInjectedClassNameType,
92289228
DefaultTestValuesForRunOptions);
92299229

9230+
INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportMatrixType,
9231+
DefaultTestValuesForRunOptions);
9232+
9233+
// FIXME: Make ImportOpenCLPipe test work.
9234+
// INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportOpenCLPipe,
9235+
// DefaultTestValuesForRunOptions);
9236+
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ImportOpenCLPipe);
9237+
92309238
} // end namespace ast_matchers
92319239
} // end namespace clang
+1-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
LLVM notes
22
----------
33

4-
This directory contains the 'googlemock' component of Google Test 1.10.0, with
4+
This directory contains the 'googlemock' component of Google Test 1.14.0, with
55
all elements removed except for the actual source code, to minimize the
66
addition to the LLVM distribution.
77

@@ -10,14 +10,10 @@ Cleaned up as follows:
1010
# Remove all the unnecessary files and directories
1111
$ rm -f CMakeLists.txt configure* Makefile* CHANGES CONTRIBUTORS README README.md .gitignore
1212
$ rm -rf build-aux make msvc scripts test docs
13-
$ rm -f `find . -name \*\.pump`
1413
$ rm -f src/gmock_main.cc
1514

1615
# Put the license in the consistent place for LLVM.
1716
$ mv LICENSE LICENSE.TXT
1817

1918
Modified as follows:
2019
* Support for std::begin/std::end in gmock-matchers.h
21-
* IWYU pragmas
22-
* Disabled -Wdeprecated-copy for clang
23-
* Added IWYU pragmas from https://github.com/google/googletest/commit/100f6fbf5f81a82d163c1e29735e8a2936eacd4f

0 commit comments

Comments
 (0)