[llvm] d4d80a2 - Bump googletest to 1.10.0

Hubert Tong via llvm-commits llvm-commits at lists.llvm.org
Sat May 15 10:05:31 PDT 2021


Sorry, I see this might already be fixed in
fde5b24963f42c8f21e32e1c5b19e81ddc52e575.

-- HT

On Sat, May 15, 2021 at 12:56 PM Hubert Tong <
hubert.reinterpretcast at gmail.com> wrote:

> @benny.kra at gmail.com <benny.kra at googlemail.com>,
>
> This commit is triggering deprecation warnings that cause build failures
> for warning-as-errors builds:
> clangd/unittests/PrintASTTests.cpp:56:1: error:
> 'InstantiateTestCase_P_IsDeprecated' is deprecated: INSTANTIATE_TEST_CASE_P
> is deprecated, please use INSTANTIATE_TEST_SUITE_P
> [-Werror,-Wdeprecated-declarations]
> INSTANTIATE_TEST_CASE_P(ASTUtilsTests, ASTUtils,
> ^
>
> On Fri, May 14, 2021 at 1:17 PM Benjamin Kramer via llvm-commits <
> llvm-commits at lists.llvm.org> wrote:
>
>>
>> Author: Benjamin Kramer
>> Date: 2021-05-14T19:16:31+02:00
>> New Revision: d4d80a2903c1d074008cac653cdb0b5fe39b8a00
>>
>> URL:
>> https://github.com/llvm/llvm-project/commit/d4d80a2903c1d074008cac653cdb0b5fe39b8a00
>> DIFF:
>> https://github.com/llvm/llvm-project/commit/d4d80a2903c1d074008cac653cdb0b5fe39b8a00.diff
>>
>> LOG: Bump googletest to 1.10.0
>>
>> Added:
>>     llvm/utils/unittest/googlemock/include/gmock/gmock-function-mocker.h
>>     llvm/utils/unittest/googlemock/include/gmock/gmock-nice-strict.h
>>     llvm/utils/unittest/googlemock/include/gmock/internal/gmock-pp.h
>>     llvm/utils/unittest/googletest/include/gtest/gtest-matchers.h
>>     llvm/utils/unittest/googletest/src/gtest-matchers.cc
>>
>> Modified:
>>     clang/unittests/AST/ASTImporterGenericRedeclTest.cpp
>>     clang/unittests/AST/ASTImporterODRStrategiesTest.cpp
>>     clang/unittests/AST/ASTImporterObjCTest.cpp
>>     clang/unittests/AST/ASTImporterTest.cpp
>>     clang/unittests/AST/ASTImporterVisibilityTest.cpp
>>     clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
>>     clang/unittests/Analysis/ExprMutationAnalyzerTest.cpp
>>     clang/unittests/Rename/RenameAliasTest.cpp
>>     clang/unittests/Rename/RenameClassTest.cpp
>>     clang/unittests/Rename/RenameEnumTest.cpp
>>     clang/unittests/Rename/RenameMemberTest.cpp
>>     clang/unittests/StaticAnalyzer/RangeSetTest.cpp
>>     clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
>>     clang/unittests/Tooling/Syntax/MutationsTest.cpp
>>     clang/unittests/Tooling/Syntax/SynthesisTest.cpp
>>     clang/unittests/Tooling/Syntax/TreeTest.cpp
>>     flang/unittests/RuntimeGTest/ListInputTest.cpp
>>     lldb/unittests/Host/SocketTest.cpp
>>     lldb/unittests/Process/Utility/LinuxProcMapsTest.cpp
>>     llvm/include/llvm/Testing/Support/Error.h
>>     llvm/unittests/ADT/BitVectorTest.cpp
>>     llvm/unittests/ADT/DenseMapTest.cpp
>>     llvm/unittests/ADT/DenseSetTest.cpp
>>     llvm/unittests/ADT/IListBaseTest.cpp
>>     llvm/unittests/ADT/IntrusiveRefCntPtrTest.cpp
>>     llvm/unittests/ADT/MapVectorTest.cpp
>>     llvm/unittests/ADT/PriorityWorklistTest.cpp
>>     llvm/unittests/ADT/RangeAdapterTest.cpp
>>     llvm/unittests/ADT/STLForwardCompatTest.cpp
>>     llvm/unittests/ADT/SmallVectorTest.cpp
>>     llvm/unittests/ADT/TinyPtrVectorTest.cpp
>>     llvm/unittests/Analysis/ValueTrackingTest.cpp
>>     llvm/unittests/CodeGen/DIETest.cpp
>>     llvm/unittests/DebugInfo/DWARF/DWARFDebugLineTest.cpp
>>     llvm/unittests/DebugInfo/DWARF/DWARFFormValueTest.cpp
>>     llvm/unittests/FileCheck/FileCheckTest.cpp
>>     llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
>>     llvm/unittests/IR/PassBuilderCallbacksTest.cpp
>>     llvm/unittests/IR/PatternMatch.cpp
>>     llvm/unittests/IR/ValueMapTest.cpp
>>     llvm/unittests/Passes/PluginsTest.cpp
>>     llvm/unittests/ProfileData/CoverageMappingTest.cpp
>>     llvm/unittests/ProfileData/InstrProfTest.cpp
>>     llvm/unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
>>     llvm/unittests/Support/MathExtrasTest.cpp
>>     llvm/unittests/Support/MemoryTest.cpp
>>     llvm/unittests/Support/TargetParserTest.cpp
>>     llvm/unittests/XRay/FDRProducerConsumerTest.cpp
>>     llvm/unittests/XRay/FDRRecordPrinterTest.cpp
>>     llvm/unittests/XRay/GraphTest.cpp
>>     llvm/utils/unittest/googlemock/include/gmock/gmock-actions.h
>>     llvm/utils/unittest/googlemock/include/gmock/gmock-cardinalities.h
>>     llvm/utils/unittest/googlemock/include/gmock/gmock-generated-actions.h
>>
>> llvm/utils/unittest/googlemock/include/gmock/gmock-generated-function-mockers.h
>>
>> llvm/utils/unittest/googlemock/include/gmock/gmock-generated-matchers.h
>>     llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h
>>     llvm/utils/unittest/googlemock/include/gmock/gmock-more-actions.h
>>     llvm/utils/unittest/googlemock/include/gmock/gmock-spec-builders.h
>>     llvm/utils/unittest/googlemock/include/gmock/gmock.h
>>
>> llvm/utils/unittest/googlemock/include/gmock/internal/gmock-internal-utils.h
>>     llvm/utils/unittest/googlemock/include/gmock/internal/gmock-port.h
>>     llvm/utils/unittest/googlemock/src/gmock-cardinalities.cc
>>     llvm/utils/unittest/googlemock/src/gmock-internal-utils.cc
>>     llvm/utils/unittest/googlemock/src/gmock-matchers.cc
>>     llvm/utils/unittest/googlemock/src/gmock-spec-builders.cc
>>     llvm/utils/unittest/googlemock/src/gmock.cc
>>     llvm/utils/unittest/googletest/include/gtest/gtest-death-test.h
>>     llvm/utils/unittest/googletest/include/gtest/gtest-message.h
>>     llvm/utils/unittest/googletest/include/gtest/gtest-param-test.h
>>     llvm/utils/unittest/googletest/include/gtest/gtest-printers.h
>>     llvm/utils/unittest/googletest/include/gtest/gtest-spi.h
>>     llvm/utils/unittest/googletest/include/gtest/gtest-test-part.h
>>     llvm/utils/unittest/googletest/include/gtest/gtest-typed-test.h
>>     llvm/utils/unittest/googletest/include/gtest/gtest.h
>>     llvm/utils/unittest/googletest/include/gtest/gtest_pred_impl.h
>>
>> llvm/utils/unittest/googletest/include/gtest/internal/gtest-death-test-internal.h
>>     llvm/utils/unittest/googletest/include/gtest/internal/gtest-filepath.h
>>     llvm/utils/unittest/googletest/include/gtest/internal/gtest-internal.h
>>
>> llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h
>>
>> llvm/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h
>>     llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h
>>     llvm/utils/unittest/googletest/include/gtest/internal/gtest-string.h
>>
>> llvm/utils/unittest/googletest/include/gtest/internal/gtest-type-util.h
>>     llvm/utils/unittest/googletest/src/gtest-all.cc
>>     llvm/utils/unittest/googletest/src/gtest-death-test.cc
>>     llvm/utils/unittest/googletest/src/gtest-filepath.cc
>>     llvm/utils/unittest/googletest/src/gtest-internal-inl.h
>>     llvm/utils/unittest/googletest/src/gtest-port.cc
>>     llvm/utils/unittest/googletest/src/gtest-printers.cc
>>     llvm/utils/unittest/googletest/src/gtest-test-part.cc
>>     llvm/utils/unittest/googletest/src/gtest-typed-test.cc
>>     llvm/utils/unittest/googletest/src/gtest.cc
>>
>> Removed:
>>
>> llvm/utils/unittest/googlemock/include/gmock/gmock-generated-nice-strict.h
>>
>> llvm/utils/unittest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h
>>
>> llvm/utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h
>>
>> llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util-generated.h
>>     llvm/utils/unittest/googletest/include/gtest/internal/gtest-tuple.h
>>
>>
>>
>> ################################################################################
>> diff  --git a/clang/unittests/AST/ASTImporterGenericRedeclTest.cpp
>> b/clang/unittests/AST/ASTImporterGenericRedeclTest.cpp
>> index 44930b1043e4a..1206fac15d4a2 100644
>> --- a/clang/unittests/AST/ASTImporterGenericRedeclTest.cpp
>> +++ b/clang/unittests/AST/ASTImporterGenericRedeclTest.cpp
>> @@ -417,231 +417,231 @@ struct RedeclChain :
>> ASTImporterOptionSpecificTestBase {
>>    }
>>  };
>>
>> -#define ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(BaseTemplate,
>> TypeParam,       \
>> +#define ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(BaseTemplate,
>> TypeParam,       \
>>                                                  NamePrefix, TestCase)
>>       \
>>    using BaseTemplate##TypeParam = BaseTemplate<TypeParam>;
>>        \
>>    TEST_P(BaseTemplate##TypeParam, NamePrefix##TestCase) {
>>       \
>>      TypedTest_##TestCase();
>>       \
>>    }
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
>>      RedeclChain, Function, ,
>>      PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
>>      RedeclChain, Class, ,
>>      PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
>>      RedeclChain, EnumClass, ,
>>      PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
>>      RedeclChain, Variable, ,
>>      PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
>>      RedeclChain, FunctionTemplate, ,
>>      PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
>>      RedeclChain, ClassTemplate, ,
>>      PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
>>      RedeclChain, VariableTemplate, ,
>>      PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
>>      RedeclChain, FunctionTemplateSpec, ,
>>      PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
>>      RedeclChain, ClassTemplateSpec, ,
>>      PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Function, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
>>
>>  DefinitionShouldBeImportedAsADefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Class, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
>>
>>  DefinitionShouldBeImportedAsADefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, EnumClass, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
>>
>>  DefinitionShouldBeImportedAsADefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Variable, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
>>
>>  DefinitionShouldBeImportedAsADefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, FunctionTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
>>
>>  DefinitionShouldBeImportedAsADefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
>>
>>  DefinitionShouldBeImportedAsADefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, VariableTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
>>
>>  DefinitionShouldBeImportedAsADefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain,
>> FunctionTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain,
>> FunctionTemplateSpec, ,
>>
>>  DefinitionShouldBeImportedAsADefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec,
>> ,
>>
>>  DefinitionShouldBeImportedAsADefinition)
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Function, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
>>
>>  ImportPrototypeAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Class, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
>>
>>  ImportPrototypeAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, EnumClass, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
>>
>>  ImportPrototypeAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Variable, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
>>
>>  ImportPrototypeAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, FunctionTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
>>
>>  ImportPrototypeAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
>>
>>  ImportPrototypeAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, VariableTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
>>
>>  ImportPrototypeAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain,
>> FunctionTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain,
>> FunctionTemplateSpec, ,
>>
>>  ImportPrototypeAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec,
>> ,
>>
>>  ImportPrototypeAfterImportedPrototype)
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Function, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
>>
>>  ImportDefinitionAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Class, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
>>
>>  ImportDefinitionAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, EnumClass, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
>>
>>  ImportDefinitionAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Variable, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
>>
>>  ImportDefinitionAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, FunctionTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
>>
>>  ImportDefinitionAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
>>
>>  ImportDefinitionAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, VariableTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
>>
>>  ImportDefinitionAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain,
>> FunctionTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain,
>> FunctionTemplateSpec, ,
>>
>>  ImportDefinitionAfterImportedPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec,
>> ,
>>
>>  ImportDefinitionAfterImportedPrototype)
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Function, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
>>
>>  ImportPrototypeAfterImportedDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Class, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
>>
>>  ImportPrototypeAfterImportedDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, EnumClass, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
>>
>>  ImportPrototypeAfterImportedDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Variable, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
>>
>>  ImportPrototypeAfterImportedDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, FunctionTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
>>
>>  ImportPrototypeAfterImportedDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
>>
>>  ImportPrototypeAfterImportedDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, VariableTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
>>
>>  ImportPrototypeAfterImportedDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain,
>> FunctionTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain,
>> FunctionTemplateSpec, ,
>>
>>  ImportPrototypeAfterImportedDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec,
>> ,
>>
>>  ImportPrototypeAfterImportedDefinition)
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Function, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
>>                                          ImportPrototypes)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Class, ,
>> ImportPrototypes)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, EnumClass, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
>> ImportPrototypes)
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
>>                                          ImportPrototypes)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Variable, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
>>                                          ImportPrototypes)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, FunctionTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
>>                                          ImportPrototypes)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
>>                                          ImportPrototypes)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, VariableTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
>>                                          ImportPrototypes)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec,
>> ,
>>                                          ImportPrototypes)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain,
>> FunctionTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain,
>> FunctionTemplateSpec, ,
>>                                          ImportPrototypes)
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Function, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
>>                                          ImportDefinitions)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Class, ,
>> ImportDefinitions)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, EnumClass, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
>> ImportDefinitions)
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
>>                                          ImportDefinitions)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Variable, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
>>                                          ImportDefinitions)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, FunctionTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
>>                                          ImportDefinitions)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
>>                                          ImportDefinitions)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, VariableTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
>>                                          ImportDefinitions)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec,
>> ,
>>                                          ImportDefinitions)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain,
>> FunctionTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain,
>> FunctionTemplateSpec, ,
>>                                          ImportDefinitions)
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Function, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
>>                                          ImportDefinitionThenPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Class, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
>>                                          ImportDefinitionThenPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, EnumClass, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
>>                                          ImportDefinitionThenPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Variable, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
>>                                          ImportDefinitionThenPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, FunctionTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
>>                                          ImportDefinitionThenPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
>>                                          ImportDefinitionThenPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, VariableTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
>>                                          ImportDefinitionThenPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain,
>> FunctionTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain,
>> FunctionTemplateSpec, ,
>>                                          ImportDefinitionThenPrototype)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec,
>> ,
>>                                          ImportDefinitionThenPrototype)
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Function, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
>>                                          ImportPrototypeThenDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Class, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
>>                                          ImportPrototypeThenDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, EnumClass, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
>>                                          ImportPrototypeThenDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Variable, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
>>                                          ImportPrototypeThenDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, FunctionTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
>>                                          ImportPrototypeThenDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
>>                                          ImportPrototypeThenDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, VariableTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
>>                                          ImportPrototypeThenDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain,
>> FunctionTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain,
>> FunctionTemplateSpec, ,
>>                                          ImportPrototypeThenDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, ClassTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec,
>> ,
>>                                          ImportPrototypeThenDefinition)
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Function, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
>>                                          WholeRedeclChainIsImportedAtOnce)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Variable, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
>>                                          WholeRedeclChainIsImportedAtOnce)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, FunctionTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
>>                                          WholeRedeclChainIsImportedAtOnce)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, VariableTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
>>                                          WholeRedeclChainIsImportedAtOnce)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain,
>> FunctionTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain,
>> FunctionTemplateSpec, ,
>>                                          WholeRedeclChainIsImportedAtOnce)
>>
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Function, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
>>
>>  ImportPrototypeThenProtoAndDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, Variable, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
>>
>>  ImportPrototypeThenProtoAndDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, FunctionTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
>>
>>  ImportPrototypeThenProtoAndDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain, VariableTemplate, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
>>
>>  ImportPrototypeThenProtoAndDefinition)
>> -ASTIMPORTER_INSTANTIATE_TYPED_TEST_CASE(RedeclChain,
>> FunctionTemplateSpec, ,
>> +ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain,
>> FunctionTemplateSpec, ,
>>
>>  ImportPrototypeThenProtoAndDefinition)
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, RedeclChainFunction,
>> -                        DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, RedeclChainClass,
>> -                        DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, RedeclChainEnumClass,
>> -                        DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, RedeclChainVariable,
>> -                        DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, RedeclChainFunctionTemplate,
>> -                        DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, RedeclChainClassTemplate,
>> -                        DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, RedeclChainVariableTemplate,
>> -                        DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests,
>> RedeclChainFunctionTemplateSpec,
>> -                        DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, RedeclChainClassTemplateSpec,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainFunction,
>> +                        DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainClass,
>> +                        DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainEnumClass,
>> +                        DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainVariable,
>> +                        DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainFunctionTemplate,
>> +                        DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainClassTemplate,
>> +                        DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainVariableTemplate,
>> +                        DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
>> RedeclChainFunctionTemplateSpec,
>> +                        DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
>> RedeclChainClassTemplateSpec,
>> +                        DefaultTestValuesForRunOptions);
>>
>>  } // end namespace ast_matchers
>>  } // end namespace clang
>>
>> diff  --git a/clang/unittests/AST/ASTImporterODRStrategiesTest.cpp
>> b/clang/unittests/AST/ASTImporterODRStrategiesTest.cpp
>> index 10cafe5bc6342..eabdfeb03ede2 100644
>> --- a/clang/unittests/AST/ASTImporterODRStrategiesTest.cpp
>> +++ b/clang/unittests/AST/ASTImporterODRStrategiesTest.cpp
>> @@ -382,7 +382,7 @@ struct ODRViolation :
>> ASTImporterOptionSpecificTestBase {
>>  // Define the parametrized tests.
>>  // ==============================
>>
>> -#define ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>>        \
>> +#define ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>        \
>>      TypeParam, ODRHandlingParam, NamePrefix, TestCase)
>>        \
>>    using TypeParam##ODRHandlingParam =
>>       \
>>        ODRViolation<TypeParam,
>> ASTImporter::ODRHandlingType::ODRHandlingParam>; \
>> @@ -392,167 +392,167 @@ struct ODRViolation :
>> ASTImporterOptionSpecificTestBase {
>>
>>  // clang-format off
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Function, Liberal, ,
>>      ImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Typedef, Liberal, ,
>>      ImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      TypedefAlias, Liberal, ,
>>      ImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Enum, Liberal, ,
>>      ImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      EnumClass, Liberal, ,
>>      ImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      EnumConstant, Liberal, ,
>>      ImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Class, Liberal, ,
>>      ImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Variable, Liberal, ,
>>      ImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Liberal, ,
>>      ImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      VarTemplate, Liberal, ,
>>      ImportConflictingDefAfterDef)
>>  // Class and variable template specializations/instantiatons are always
>>  // imported conservatively, because the AST holds the specializations in
>> a set,
>>  // and the key within the set is a hash calculated from the arguments of
>> the
>>  // specialization.
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplateSpec, Liberal, ,
>>      DontImportConflictingDefAfterDef) // Don't import !!!
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      VarTemplateSpec, Liberal, ,
>>      DontImportConflictingDefAfterDef) // Don't import !!!
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Function, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Typedef, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      TypedefAlias, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Enum, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      EnumClass, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      EnumConstant, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Class, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Variable, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      VarTemplate, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplateSpec, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      VarTemplateSpec, Conservative, ,
>>      DontImportConflictingDefAfterDef)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Function, Liberal, ,
>>      ImportConflictingProtoAfterProto)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Variable, Liberal, ,
>>      ImportConflictingProtoAfterProto)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Liberal, ,
>>      ImportConflictingProtoAfterProto)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Function, Conservative, ,
>>      DontImportConflictingProtoAfterProto)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Variable, Conservative, ,
>>      DontImportConflictingProtoAfterProto)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Conservative, ,
>>      DontImportConflictingProtoAfterProto)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Variable, Liberal, ,
>>      ImportConflictingProtoAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Liberal, ,
>>      ImportConflictingProtoAfterDef)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Variable, Conservative, ,
>>      DontImportConflictingProtoAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Conservative, ,
>>      DontImportConflictingProtoAfterDef)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Function, Liberal, ,
>>      ImportConflictingDefAfterProto)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Variable, Liberal, ,
>>      ImportConflictingDefAfterProto)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Liberal, ,
>>      ImportConflictingDefAfterProto)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Function, Conservative, ,
>>      DontImportConflictingDefAfterProto)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      Variable, Conservative, ,
>>      DontImportConflictingDefAfterProto)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Conservative, ,
>>      DontImportConflictingDefAfterProto)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Liberal, ,
>>      ImportConflictingProtoDefAfterProto)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Conservative, ,
>>      DontImportConflictingProtoDefAfterProto)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Liberal, ,
>>      ImportConflictingProtoAfterProtoDef)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Conservative, ,
>>      DontImportConflictingProtoAfterProtoDef)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Liberal, ,
>>      ImportConflictingProtoDefAfterDef)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Conservative, ,
>>      DontImportConflictingProtoDefAfterDef)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Liberal, ,
>>      ImportConflictingDefAfterProtoDef)
>>
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      ClassTemplate, Conservative, ,
>>      DontImportConflictingDefAfterProtoDef)
>>
>> @@ -565,28 +565,28 @@ ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>>  // has nothing to do with function template specializations. Fully
>> specialized
>>  // function templates are imported as new nodes if their template
>> arguments are
>>  //
>> diff erent.
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      FunctionTemplate, Liberal, ,
>>      ImportDifferentDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      FunctionTemplateSpec, Liberal, ,
>>      ImportDifferentDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      FunctionTemplate, Conservative, ,
>>      ImportDifferentDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      FunctionTemplateSpec, Conservative, ,
>>      ImportDifferentDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      FunctionTemplate, Liberal, ,
>>      DontImportSameDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      FunctionTemplateSpec, Liberal, ,
>>      DontImportSameDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      FunctionTemplate, Conservative, ,
>>      DontImportSameDefAfterDef)
>> -ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>> +ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
>>      FunctionTemplateSpec, Conservative, ,
>>      DontImportSameDefAfterDef)
>>
>> @@ -596,99 +596,99 @@ ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_CASE(
>>
>>  // FIXME: These fail on Windows.
>>  #if !defined(_WIN32)
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, FunctionConservative,
>> -    DefaultTestValuesForRunOptions, );
>> +    DefaultTestValuesForRunOptions );
>>  #endif
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, TypedefConservative,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, TypedefAliasConservative,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, EnumConservative,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, EnumClassConservative,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, EnumConstantConservative,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, ClassConservative,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, VariableConservative,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, ClassTemplateConservative,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, FunctionTemplateConservative,
>> -    DefaultTestValuesForRunOptions, );
>> +    DefaultTestValuesForRunOptions);
>>  // FIXME: Make VarTemplate tests work.
>> -//INSTANTIATE_TEST_CASE_P(
>> +//INSTANTIATE_TEST_SUITE_P(
>>      //ODRViolationTests, VarTemplateConservative,
>> -    //DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    //DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, FunctionTemplateSpecConservative,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, ClassTemplateSpecConservative,
>> -    DefaultTestValuesForRunOptions, );
>> +    DefaultTestValuesForRunOptions);
>>  // FIXME: Make VarTemplateSpec tests work.
>> -//INSTANTIATE_TEST_CASE_P(
>> +//INSTANTIATE_TEST_SUITE_P(
>>      //ODRViolationTests, VarTemplateSpecConservative,
>> -    //DefaultTestValuesForRunOptions, );
>> +    //DefaultTestValuesForRunOptions);
>>
>>  // FIXME: These fail on Windows.
>>  #if !defined(_WIN32)
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, FunctionLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> +    DefaultTestValuesForRunOptions);
>>  #endif
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, TypedefLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, TypedefAliasLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, EnumLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, EnumClassLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, EnumConstantLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, ClassLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, VariableLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, ClassTemplateLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, FunctionTemplateLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> +    DefaultTestValuesForRunOptions);
>>  // FIXME: Make VarTemplate tests work.
>> -// INSTANTIATE_TEST_CASE_P(
>> +// INSTANTIATE_TEST_SUITE_P(
>>  //     ODRViolationTests, VarTemplateLiberal,
>> -//     DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +//     DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, ClassTemplateSpecLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> -INSTANTIATE_TEST_CASE_P(
>> +    DefaultTestValuesForRunOptions);
>> +INSTANTIATE_TEST_SUITE_P(
>>      ODRViolationTests, FunctionTemplateSpecLiberal,
>> -    DefaultTestValuesForRunOptions, );
>> +    DefaultTestValuesForRunOptions);
>>  // FIXME: Make VarTemplateSpec tests work.
>> -//INSTANTIATE_TEST_CASE_P(
>> +//INSTANTIATE_TEST_SUITE_P(
>>      //ODRViolationTests, VarTemplateSpecLiberal,
>> -    //DefaultTestValuesForRunOptions, );
>> +    //DefaultTestValuesForRunOptions );
>>
>>  // clang-format on
>>
>>
>> diff  --git a/clang/unittests/AST/ASTImporterObjCTest.cpp
>> b/clang/unittests/AST/ASTImporterObjCTest.cpp
>> index 2d848dcf754ed..c9751fd8dda8b 100644
>> --- a/clang/unittests/AST/ASTImporterObjCTest.cpp
>> +++ b/clang/unittests/AST/ASTImporterObjCTest.cpp
>> @@ -85,5 +85,5 @@ static const auto ObjCTestArrayForRunOptions =
>>  const auto ObjCTestValuesForRunOptions =
>>      ::testing::ValuesIn(ObjCTestArrayForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportObjCDecl,
>> -                        ObjCTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportObjCDecl,
>> +                         ObjCTestValuesForRunOptions);
>>
>> diff  --git a/clang/unittests/AST/ASTImporterTest.cpp
>> b/clang/unittests/AST/ASTImporterTest.cpp
>> index b0a8c829809dd..e62203f286572 100644
>> --- a/clang/unittests/AST/ASTImporterTest.cpp
>> +++ b/clang/unittests/AST/ASTImporterTest.cpp
>> @@ -5568,15 +5568,15 @@ TEST_P(ASTImporterOptionSpecificTestBase,
>>    EXPECT_EQ(ImportedX->isAggregate(), FromX->isAggregate());
>>  }
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, SVEBuiltins,
>> -                        ::testing::Values(std::vector<std::string>{
>> -                            "-target", "aarch64-linux-gnu"}), );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, SVEBuiltins,
>> +                         ::testing::Values(std::vector<std::string>{
>> +                             "-target", "aarch64-linux-gnu"}));
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, DeclContextTest,
>> -                        ::testing::Values(std::vector<std::string>()), );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, DeclContextTest,
>> +                         ::testing::Values(std::vector<std::string>()));
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, CanonicalRedeclChain,
>> -                        ::testing::Values(std::vector<std::string>()), );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, CanonicalRedeclChain,
>> +                         ::testing::Values(std::vector<std::string>()));
>>
>>  TEST_P(ASTImporterOptionSpecificTestBase, LambdasAreDifferentiated) {
>>    Decl *FromTU = getTuDecl(
>> @@ -6226,8 +6226,8 @@ TEST_P(CTAD, DeductionGuideShouldCopyALocalTypedef)
>> {
>>    EXPECT_NE(Param->getType()->castAs<TypedefType>()->getDecl(), Typedef);
>>  }
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, CTAD,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, CTAD,
>> +                         DefaultTestValuesForRunOptions);
>>
>>  TEST_P(ASTImporterOptionSpecificTestBase, TypedefWithAttribute) {
>>    Decl *TU = getTuDecl(
>> @@ -6323,79 +6323,79 @@ TEST_P(ASTImporterOptionSpecificTestBase,
>> ImportEnumMemberSpecialization) {
>>              ToD->getTemplateSpecializationKind());
>>  }
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ASTImporterLookupTableTest,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ASTImporterLookupTableTest,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportPath,
>> -                        ::testing::Values(std::vector<std::string>()), );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportPath,
>> +                         ::testing::Values(std::vector<std::string>()));
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportExpr,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportExpr,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportFixedPointExpr,
>> -                        ExtendWithOptions(DefaultTestArrayForRunOptions,
>> -                                          std::vector<std::string>{
>> -                                              "-ffixed-point"}), );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFixedPointExpr,
>> +                         ExtendWithOptions(DefaultTestArrayForRunOptions,
>> +                                           std::vector<std::string>{
>> +                                               "-ffixed-point"}));
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportBlock,
>> -                        ExtendWithOptions(DefaultTestArrayForRunOptions,
>> -                                          std::vector<std::string>{
>> -                                              "-fblocks"}), );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportBlock,
>> +                         ExtendWithOptions(DefaultTestArrayForRunOptions,
>> +                                           std::vector<std::string>{
>> +                                               "-fblocks"}));
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportType,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportType,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportDecl,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportDecl,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests,
>> ASTImporterOptionSpecificTestBase,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
>> ASTImporterOptionSpecificTestBase,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ErrorHandlingTest,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ErrorHandlingTest,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, RedirectingImporterTest,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedirectingImporterTest,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportFunctions,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFunctions,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportAutoFunctions,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportAutoFunctions,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportFunctionTemplates,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFunctionTemplates,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests,
>> ImportFriendFunctionTemplates,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
>> ImportFriendFunctionTemplates,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportClasses,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportClasses,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportFriendFunctions,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFriendFunctions,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportFriendClasses,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFriendClasses,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests,
>> -                        ImportFunctionTemplateSpecializations,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
>> +                         ImportFunctionTemplateSpecializations,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportImplicitMethods,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportImplicitMethods,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportVariables,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportVariables,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, LLDBLookupTest,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, LLDBLookupTest,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportSourceLocations,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportSourceLocations,
>> +                         DefaultTestValuesForRunOptions);
>>
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests, ImportWithExternalSource,
>> -                        DefaultTestValuesForRunOptions, );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportWithExternalSource,
>> +                         DefaultTestValuesForRunOptions);
>>
>>  } // end namespace ast_matchers
>>  } // end namespace clang
>>
>> diff  --git a/clang/unittests/AST/ASTImporterVisibilityTest.cpp
>> b/clang/unittests/AST/ASTImporterVisibilityTest.cpp
>> index 262402415658f..cf3e51caeac7a 100644
>> --- a/clang/unittests/AST/ASTImporterVisibilityTest.cpp
>> +++ b/clang/unittests/AST/ASTImporterVisibilityTest.cpp
>> @@ -177,11 +177,11 @@ TEST_P(ImportClassTemplatesVisibilityChain,
>> ImportChain) {
>>  }
>>
>>  // Automatic instantiation of the value-parameterized tests.
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests,
>> ImportFunctionsVisibilityChain,
>> -                        ::testing::Combine(
>> -                           DefaultTestValuesForRunOptions,
>> -                           ::testing::Values(ExternF, StaticF, AnonF)),
>> );
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
>> ImportFunctionsVisibilityChain,
>> +
>>  ::testing::Combine(DefaultTestValuesForRunOptions,
>> +                                            ::testing::Values(ExternF,
>> StaticF,
>> +                                                              AnonF)));
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportVariablesVisibilityChain,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> @@ -192,31 +192,31 @@ INSTANTIATE_TEST_CASE_P(
>>          // initializer is a tentative definition, subsequent definitions
>> may be
>>          // provided but they must have the same linkage.  See also the
>> test
>>          // ImportVariableChainInC which test for this special C Lang
>> case.
>> -        ::testing::Values(ExternV, AnonV)), );
>> -INSTANTIATE_TEST_CASE_P(
>> +        ::testing::Values(ExternV, AnonV)) );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportClassesVisibilityChain,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> -        ::testing::Values(ExternC, AnonC)), );
>> -INSTANTIATE_TEST_CASE_P(
>> +        ::testing::Values(ExternC, AnonC)) );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportScopedEnumsVisibilityChain,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> -        ::testing::Values(ExternEC, AnonEC)), );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests,
>> +        ::testing::Values(ExternEC, AnonEC)) );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
>>                          ImportFunctionTemplatesVisibilityChain,
>>
>>  ::testing::Combine(DefaultTestValuesForRunOptions,
>>                                             ::testing::Values(ExternFT,
>> StaticFT,
>> -                                                             AnonFT)), );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests,
>> +                                                             AnonFT)) );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
>>                          ImportVariableTemplatesVisibilityChain,
>>
>>  ::testing::Combine(DefaultTestValuesForRunOptions,
>>                                             ::testing::Values(ExternVT,
>> -                                                             AnonVT)), );
>> -INSTANTIATE_TEST_CASE_P(ParameterizedTests,
>> ImportClassTemplatesVisibilityChain,
>> +                                                             AnonVT)) );
>> +INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
>> ImportClassTemplatesVisibilityChain,
>>
>>  ::testing::Combine(DefaultTestValuesForRunOptions,
>>                                             ::testing::Values(ExternCT,
>> -                                                             AnonCT)), );
>> +                                                             AnonCT)) );
>>
>>  // First value in tuple: Compile options.
>>  // Second value in tuple: Tuple with informations for the test.
>> @@ -398,7 +398,7 @@ TEST_P(ImportClassTemplatesVisibility,
>> ImportAfterImport) {
>>  const bool ExpectLinkedDeclChain = true;
>>  const bool ExpectUnlinkedDeclChain = false;
>>
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportFunctionsVisibility,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> @@ -411,8 +411,8 @@ INSTANTIATE_TEST_CASE_P(
>>              std::make_tuple(StaticF, AnonF, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonF, ExternF, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonF, StaticF, ExpectUnlinkedDeclChain),
>> -            std::make_tuple(AnonF, AnonF, ExpectUnlinkedDeclChain))), );
>> -INSTANTIATE_TEST_CASE_P(
>> +            std::make_tuple(AnonF, AnonF, ExpectUnlinkedDeclChain))) );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportVariablesVisibility,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> @@ -425,8 +425,8 @@ INSTANTIATE_TEST_CASE_P(
>>              std::make_tuple(StaticV, AnonV, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonV, ExternV, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonV, StaticV, ExpectUnlinkedDeclChain),
>> -            std::make_tuple(AnonV, AnonV, ExpectUnlinkedDeclChain))), );
>> -INSTANTIATE_TEST_CASE_P(
>> +            std::make_tuple(AnonV, AnonV, ExpectUnlinkedDeclChain))) );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportClassesVisibility,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> @@ -434,8 +434,8 @@ INSTANTIATE_TEST_CASE_P(
>>              std::make_tuple(ExternC, ExternC, ExpectLinkedDeclChain),
>>              std::make_tuple(ExternC, AnonC, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonC, ExternC, ExpectUnlinkedDeclChain),
>> -            std::make_tuple(AnonC, AnonC, ExpectUnlinkedDeclChain))), );
>> -INSTANTIATE_TEST_CASE_P(
>> +            std::make_tuple(AnonC, AnonC, ExpectUnlinkedDeclChain))) );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportEnumsVisibility,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> @@ -443,8 +443,8 @@ INSTANTIATE_TEST_CASE_P(
>>              std::make_tuple(ExternE, ExternE, ExpectLinkedDeclChain),
>>              std::make_tuple(ExternE, AnonE, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonE, ExternE, ExpectUnlinkedDeclChain),
>> -            std::make_tuple(AnonE, AnonE, ExpectUnlinkedDeclChain))), );
>> -INSTANTIATE_TEST_CASE_P(
>> +            std::make_tuple(AnonE, AnonE, ExpectUnlinkedDeclChain))) );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportScopedEnumsVisibility,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> @@ -452,8 +452,8 @@ INSTANTIATE_TEST_CASE_P(
>>              std::make_tuple(ExternEC, ExternEC, ExpectLinkedDeclChain),
>>              std::make_tuple(ExternEC, AnonEC, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonEC, ExternEC, ExpectUnlinkedDeclChain),
>> -            std::make_tuple(AnonEC, AnonEC, ExpectUnlinkedDeclChain))),
>> );
>> -INSTANTIATE_TEST_CASE_P(
>> +            std::make_tuple(AnonEC, AnonEC, ExpectUnlinkedDeclChain))) );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportTypedefNameVisibility,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> @@ -480,8 +480,8 @@ INSTANTIATE_TEST_CASE_P(
>>              std::make_tuple(ExternTypedef, AnonUsing,
>> ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonTypedef, ExternUsing,
>> ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonTypedef, AnonUsing,
>> -                            ExpectUnlinkedDeclChain))), );
>> -INSTANTIATE_TEST_CASE_P(
>> +                            ExpectUnlinkedDeclChain))) );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportFunctionTemplatesVisibility,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> @@ -494,8 +494,8 @@ INSTANTIATE_TEST_CASE_P(
>>              std::make_tuple(StaticFT, AnonFT, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonFT, ExternFT, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonFT, StaticFT, ExpectUnlinkedDeclChain),
>> -            std::make_tuple(AnonFT, AnonFT, ExpectUnlinkedDeclChain))),
>> );
>> -INSTANTIATE_TEST_CASE_P(
>> +            std::make_tuple(AnonFT, AnonFT, ExpectUnlinkedDeclChain))) );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportVariableTemplatesVisibility,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>> @@ -508,14 +508,14 @@ INSTANTIATE_TEST_CASE_P(
>>              std::make_tuple(StaticVT, AnonVT, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonVT, ExternVT, ExpectUnlinkedDeclChain),
>>              std::make_tuple(AnonVT, StaticVT, ExpectUnlinkedDeclChain),
>> -            std::make_tuple(AnonVT, AnonVT, ExpectUnlinkedDeclChain))),
>> );
>> -INSTANTIATE_TEST_CASE_P(
>> +            std::make_tuple(AnonVT, AnonVT, ExpectUnlinkedDeclChain))) );
>> +INSTANTIATE_TEST_SUITE_P(
>>      ParameterizedTests, ImportClassTemplatesVisibility,
>>      ::testing::Combine(
>>          DefaultTestValuesForRunOptions,
>>          ::testing::Values(std::make_tuple(ExternCT, ExternCT,
>> ExpectLinkedDeclChain),
>>                            std::make_tuple(ExternCT, AnonCT,
>> ExpectUnlinkedDeclChain),
>>                            std::make_tuple(AnonCT, ExternCT,
>> ExpectUnlinkedDeclChain),
>> -                          std::make_tuple(AnonCT, AnonCT,
>> ExpectUnlinkedDeclChain))), );
>> +                          std::make_tuple(AnonCT, AnonCT,
>> ExpectUnlinkedDeclChain))) );
>>  } // end namespace ast_matchers
>>  } // end namespace clang
>>
>> diff  --git a/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
>> b/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
>> index 23b31509cd488..c179ce11fefb9 100644
>> --- a/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
>> +++ b/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
>> @@ -2302,8 +2302,8 @@ static std::vector<TestClangConfig>
>> allTestClangConfigs() {
>>    return all_configs;
>>  }
>>
>> -INSTANTIATE_TEST_CASE_P(ASTMatchersTests, ASTMatchersTest,
>> -                        testing::ValuesIn(allTestClangConfigs()), );
>> +INSTANTIATE_TEST_SUITE_P(ASTMatchersTests, ASTMatchersTest,
>> +                         testing::ValuesIn(allTestClangConfigs()));
>>
>>  } // namespace ast_matchers
>>  } // namespace clang
>>
>> diff  --git a/clang/unittests/Analysis/ExprMutationAnalyzerTest.cpp
>> b/clang/unittests/Analysis/ExprMutationAnalyzerTest.cpp
>> index a968d292b53f5..a4410d330d393 100644
>> --- a/clang/unittests/Analysis/ExprMutationAnalyzerTest.cpp
>> +++ b/clang/unittests/Analysis/ExprMutationAnalyzerTest.cpp
>> @@ -203,9 +203,9 @@ TEST_P(AssignmentTest, AssignmentModifies) {
>>    }
>>  }
>>
>> -INSTANTIATE_TEST_CASE_P(AllAssignmentOperators, AssignmentTest,
>> +INSTANTIATE_TEST_SUITE_P(AllAssignmentOperators, AssignmentTest,
>>                          Values("=", "+=", "-=", "*=", "/=", "%=", "&=",
>> "|=",
>> -                               "^=", "<<=", ">>="), );
>> +                               "^=", "<<=", ">>=") );
>>
>>  TEST(ExprMutationAnalyzerTest, AssignmentConditionalWithInheritance) {
>>    const auto AST = buildASTFromCode("struct Base {void nonconst(); };"
>> @@ -230,9 +230,9 @@ TEST_P(IncDecTest, IncDecModifies) {
>>    EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre(ModExpr));
>>  }
>>
>> -INSTANTIATE_TEST_CASE_P(AllIncDecOperators, IncDecTest,
>> +INSTANTIATE_TEST_SUITE_P(AllIncDecOperators, IncDecTest,
>>                          Values("++x", "--x", "x++", "x--", "++(x)",
>> "--(x)",
>> -                               "(x)++", "(x)--"), );
>> +                               "(x)++", "(x)--") );
>>
>>  // Section: member functions
>>
>>
>> diff  --git a/clang/unittests/Rename/RenameAliasTest.cpp
>> b/clang/unittests/Rename/RenameAliasTest.cpp
>> index ad9ce65ac8492..50fa2c104263f 100644
>> --- a/clang/unittests/Rename/RenameAliasTest.cpp
>> +++ b/clang/unittests/Rename/RenameAliasTest.cpp
>> @@ -45,7 +45,7 @@ class RenameAliasTest : public ClangRenameTest {
>>    }
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      RenameAliasTests, RenameAliasTest,
>>      testing::ValuesIn(std::vector<Case>({
>>          // basic functions
>> @@ -190,7 +190,7 @@ INSTANTIATE_TEST_CASE_P(
>>           "NewTPtr"},
>>          {"void f(::TPtr<int> p) {}", "void f(::NewTPtr<int> p) {}",
>> "TPtr",
>>           "NewTPtr"},
>> -    })), );
>> +    })));
>>
>>  TEST_P(RenameAliasTest, RenameAlias) {
>>    auto Param = GetParam();
>>
>> diff  --git a/clang/unittests/Rename/RenameClassTest.cpp
>> b/clang/unittests/Rename/RenameClassTest.cpp
>> index 1b008987a16d3..24370b5795e94 100644
>> --- a/clang/unittests/Rename/RenameClassTest.cpp
>> +++ b/clang/unittests/Rename/RenameClassTest.cpp
>> @@ -45,7 +45,7 @@ class RenameClassTest : public ClangRenameTest {
>>    }
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      RenameClassTests, RenameClassTest,
>>      testing::ValuesIn(std::vector<Case>({
>>          // basic classes
>> @@ -189,7 +189,7 @@ INSTANTIATE_TEST_CASE_P(
>>          // friends, everyone needs friends.
>>          {"class Foo { int i; friend class a::Foo; };",
>>           "class Foo { int i; friend class b::Bar; };", "", ""},
>> -    })), );
>> +    })) );
>>
>>  TEST_P(RenameClassTest, RenameClasses) {
>>    auto Param = GetParam();
>> @@ -217,7 +217,7 @@ class NamespaceDetectionTest : public ClangRenameTest
>> {
>>    }
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      RenameClassTest, NamespaceDetectionTest,
>>      ::testing::ValuesIn(std::vector<Case>({
>>          // Test old and new namespace overlap.
>> @@ -298,7 +298,7 @@ INSTANTIATE_TEST_CASE_P(
>>          {"namespace o1 { class Foo { int i; friend class Old; }; }",
>>           "namespace o1 { class Foo { int i; friend class New; }; }",
>>           "::o1::Old", "::o1::New"},
>> -    })), );
>> +    })) );
>>
>>  TEST_P(NamespaceDetectionTest, RenameClasses) {
>>    auto Param = GetParam();
>> @@ -339,7 +339,7 @@ class TemplatedClassRenameTest : public
>> ClangRenameTest {
>>    }
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      RenameClassTests, TemplatedClassRenameTest,
>>      ::testing::ValuesIn(std::vector<Case>({
>>          {"Old<int> gI; Old<bool> gB;", "New<int> gI; New<bool> gB;",
>> "Old",
>> @@ -394,7 +394,7 @@ INSTANTIATE_TEST_CASE_P(
>>          {"template <typename T> struct Moo { ns::Old<T> o_; }; Moo<int>
>> m;",
>>           "template <typename T> struct Moo { ns::New<T> o_; }; Moo<int>
>> m;",
>>           "ns::Old", "ns::New"},
>> -    })), );
>> +    })) );
>>
>>  TEST_P(TemplatedClassRenameTest, RenameTemplateClasses) {
>>    auto Param = GetParam();
>>
>> diff  --git a/clang/unittests/Rename/RenameEnumTest.cpp
>> b/clang/unittests/Rename/RenameEnumTest.cpp
>> index 55dcd11ac4128..dc3440047c4a4 100644
>> --- a/clang/unittests/Rename/RenameEnumTest.cpp
>> +++ b/clang/unittests/Rename/RenameEnumTest.cpp
>> @@ -26,7 +26,7 @@ class RenameEnumTest : public ClangRenameTest {
>>    }
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      RenameEnumTests, RenameEnumTest,
>>      testing::ValuesIn(std::vector<Case>({
>>          {"void f(a::A2 arg) { a::A2 t = a::A2::Blue; }",
>> @@ -142,7 +142,7 @@ INSTANTIATE_TEST_CASE_P(
>>           "struct Foo { template <typename T> T foo(); }; void g() { Foo
>> f;  "
>>           "f.foo<b::B2>(); }",
>>           "a::A2", "b::B2"},
>> -    })), );
>> +    })) );
>>
>>  TEST_P(RenameEnumTest, RenameEnums) {
>>    auto Param = GetParam();
>>
>> diff  --git a/clang/unittests/Rename/RenameMemberTest.cpp
>> b/clang/unittests/Rename/RenameMemberTest.cpp
>> index c9192c638a225..c16d16aa25f04 100644
>> --- a/clang/unittests/Rename/RenameMemberTest.cpp
>> +++ b/clang/unittests/Rename/RenameMemberTest.cpp
>> @@ -69,15 +69,15 @@ class RenameMemberTest : public ClangRenameTest {
>>    }
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      DISABLED_RenameTemplatedClassStaticVariableTest, RenameMemberTest,
>>      testing::ValuesIn(std::vector<Case>({
>>          // FIXME: support renaming static variables for template classes.
>>          {"void f() { ns::TA<int>::SMoo; }",
>>           "void f() { ns::TA<int>::SMeh; }", "ns::TA::SMoo",
>> "ns::TA::SMeh"},
>> -    })), );
>> +    })) );
>>
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      RenameMemberTest, RenameMemberTest,
>>      testing::ValuesIn(std::vector<Case>({
>>          // Normal methods and fields.
>> @@ -154,7 +154,7 @@ INSTANTIATE_TEST_CASE_P(
>>           "TA::SFoo", "TB::SBar"},
>>          {"void f() { ns::TB<int>::SFoo(); }",
>>           "void f() { ns::TB<int>::SBar(); }", "ns::TA::SFoo",
>> "ns::TB::SBar"},
>> -    })), );
>> +    })) );
>>
>>  TEST_P(RenameMemberTest, RenameMembers) {
>>    auto Param = GetParam();
>>
>> diff  --git a/clang/unittests/StaticAnalyzer/RangeSetTest.cpp
>> b/clang/unittests/StaticAnalyzer/RangeSetTest.cpp
>> index 5be2ee3fc520b..c29a5eef00e16 100644
>> --- a/clang/unittests/StaticAnalyzer/RangeSetTest.cpp
>> +++ b/clang/unittests/StaticAnalyzer/RangeSetTest.cpp
>> @@ -188,7 +188,7 @@ llvm::APSInt
>> RangeSetTest<BaseType>::Base{sizeof(BaseType) * 8, !isSigned()};
>>
>>  using IntTypes = ::testing::Types<int8_t, uint8_t, int16_t, uint16_t,
>> int32_t,
>>                                    uint32_t, int64_t, uint64_t>;
>> -TYPED_TEST_CASE(RangeSetTest, IntTypes);
>> +TYPED_TEST_SUITE(RangeSetTest, IntTypes);
>>
>>  TYPED_TEST(RangeSetTest, RangeSetNegateTest) {
>>    // Use next values of the range {MIN, A, B, MID, C, D, MAX}.
>>
>> diff  --git a/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
>> b/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
>> index b6bcd4eb2da5d..8529d65265761 100644
>> --- a/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
>> +++ b/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
>> @@ -88,8 +88,8 @@ class BuildSyntaxTreeTest : public SyntaxTreeTest {
>>    }
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(SyntaxTreeTests, BuildSyntaxTreeTest,
>> -                        testing::ValuesIn(allTestClangConfigs()), );
>> +INSTANTIATE_TEST_SUITE_P(SyntaxTreeTests, BuildSyntaxTreeTest,
>> +                        testing::ValuesIn(allTestClangConfigs()) );
>>
>>  TEST_P(BuildSyntaxTreeTest, Simple) {
>>    EXPECT_TRUE(treeDumpEqual(
>>
>> diff  --git a/clang/unittests/Tooling/Syntax/MutationsTest.cpp
>> b/clang/unittests/Tooling/Syntax/MutationsTest.cpp
>> index f63d3dffa4597..34279dc2d941b 100644
>> --- a/clang/unittests/Tooling/Syntax/MutationsTest.cpp
>> +++ b/clang/unittests/Tooling/Syntax/MutationsTest.cpp
>> @@ -54,8 +54,8 @@ class MutationTest : public SyntaxTreeTest {
>>    };
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(SyntaxTreeTests, MutationTest,
>> -                        ::testing::ValuesIn(allTestClangConfigs()), );
>> +INSTANTIATE_TEST_SUITE_P(SyntaxTreeTests, MutationTest,
>> +                        ::testing::ValuesIn(allTestClangConfigs()) );
>>
>>  TEST_P(MutationTest, RemoveStatement_InCompound) {
>>    CheckTransformation(RemoveStatement, "void test() { [[100+100;]]
>> test(); }",
>>
>> diff  --git a/clang/unittests/Tooling/Syntax/SynthesisTest.cpp
>> b/clang/unittests/Tooling/Syntax/SynthesisTest.cpp
>> index a815989bc93fe..0bdc7bbdeb0f9 100644
>> --- a/clang/unittests/Tooling/Syntax/SynthesisTest.cpp
>> +++ b/clang/unittests/Tooling/Syntax/SynthesisTest.cpp
>> @@ -38,8 +38,8 @@ class SynthesisTest : public SyntaxTreeTest {
>>    }
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(SynthesisTests, SynthesisTest,
>> -                        ::testing::ValuesIn(allTestClangConfigs()), );
>> +INSTANTIATE_TEST_SUITE_P(SynthesisTests, SynthesisTest,
>> +                        ::testing::ValuesIn(allTestClangConfigs()) );
>>
>>  TEST_P(SynthesisTest, Leaf_Punctuation) {
>>    buildTree("", GetParam());
>>
>> diff  --git a/clang/unittests/Tooling/Syntax/TreeTest.cpp
>> b/clang/unittests/Tooling/Syntax/TreeTest.cpp
>> index ed839e269dde4..06da4e80156a4 100644
>> --- a/clang/unittests/Tooling/Syntax/TreeTest.cpp
>> +++ b/clang/unittests/Tooling/Syntax/TreeTest.cpp
>> @@ -103,8 +103,8 @@ class TreeTest : public SyntaxTreeTest {
>>    }
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(TreeTests, TreeTest,
>> -                        ::testing::ValuesIn(allTestClangConfigs()), );
>> +INSTANTIATE_TEST_SUITE_P(TreeTests, TreeTest,
>> +                        ::testing::ValuesIn(allTestClangConfigs()) );
>>
>>  TEST_P(TreeTest, FirstLeaf) {
>>    buildTree("", GetParam());
>> @@ -222,8 +222,8 @@ class ListTest : public SyntaxTreeTest {
>>    }
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(TreeTests, ListTest,
>> -                        ::testing::ValuesIn(allTestClangConfigs()), );
>> +INSTANTIATE_TEST_SUITE_P(TreeTests, ListTest,
>> +                        ::testing::ValuesIn(allTestClangConfigs()) );
>>
>>  /// "a, b, c"  <=> [("a", ","), ("b", ","), ("c", null)]
>>  TEST_P(ListTest, List_Separated_WellFormed) {
>>
>> diff  --git a/flang/unittests/RuntimeGTest/ListInputTest.cpp
>> b/flang/unittests/RuntimeGTest/ListInputTest.cpp
>> index 9654048f20bb8..7aa42905c4365 100644
>> --- a/flang/unittests/RuntimeGTest/ListInputTest.cpp
>> +++ b/flang/unittests/RuntimeGTest/ListInputTest.cpp
>> @@ -183,9 +183,9 @@ TEST_P(SimpleListInputTest, TestListInput) {
>>    }
>>  }
>>
>> -INSTANTIATE_TEST_CASE_P(SimpleListInputTestInstantiation,
>> SimpleListInputTest,
>> +INSTANTIATE_TEST_SUITE_P(SimpleListInputTestInstantiation,
>> SimpleListInputTest,
>>      testing::Values(std::make_tuple("", std::vector<int>{}),
>>          std::make_tuple("0", std::vector<int>{}),
>>          std::make_tuple("1", std::vector<int>{1}),
>>          std::make_tuple("1, 2", std::vector<int>{1, 2}),
>> -        std::make_tuple("3*2", std::vector<int>{2, 2, 2})), );
>> +        std::make_tuple("3*2", std::vector<int>{2, 2, 2})));
>>
>> diff  --git a/lldb/unittests/Host/SocketTest.cpp
>> b/lldb/unittests/Host/SocketTest.cpp
>> index 901f878d2e466..27d42f835718b 100644
>> --- a/lldb/unittests/Host/SocketTest.cpp
>> +++ b/lldb/unittests/Host/SocketTest.cpp
>> @@ -228,7 +228,7 @@ TEST_P(SocketTest, DomainGetConnectURI) {
>>  }
>>  #endif
>>
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      SocketTests, SocketTest,
>>      testing::Values(SocketTestParams{/*is_ipv6=*/false,
>>                                       /*localhost_ip=*/"127.0.0.1"},
>>
>> diff  --git a/lldb/unittests/Process/Utility/LinuxProcMapsTest.cpp
>> b/lldb/unittests/Process/Utility/LinuxProcMapsTest.cpp
>> index 203875533d93a..66db61ff65969 100644
>> --- a/lldb/unittests/Process/Utility/LinuxProcMapsTest.cpp
>> +++ b/lldb/unittests/Process/Utility/LinuxProcMapsTest.cpp
>> @@ -62,7 +62,7 @@ TEST_P(LinuxProcMapsTestFixture, ParseMapRegions) {
>>
>>  // Note: ConstString("") != ConstString(nullptr)
>>  // When a region has no name, it will have the latter in the
>> MemoryRegionInfo
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      ProcMapTests, LinuxProcMapsTestFixture,
>>      ::testing::Values(
>>          // Nothing in nothing out
>> @@ -125,11 +125,11 @@ INSTANTIATE_TEST_CASE_P(
>>                      ConstString("[vsyscall]"),
>> MemoryRegionInfo::eDontKnow, 0,
>>                      MemoryRegionInfo::eDontKnow),
>>              },
>> -            "")), );
>> +            "")));
>>
>>  class LinuxProcSMapsTestFixture : public LinuxProcMapsTestFixture {};
>>
>> -INSTANTIATE_TEST_CASE_P(
>> +INSTANTIATE_TEST_SUITE_P(
>>      ProcSMapTests, LinuxProcSMapsTestFixture,
>>      ::testing::Values(
>>          // Nothing in nothing out
>> @@ -253,7 +253,7 @@ INSTANTIATE_TEST_CASE_P(
>>                                   MemoryRegionInfo::eDontKnow, 0,
>>                                   MemoryRegionInfo::eDontKnow),
>>              },
>> -            "")), );
>> +            "")));
>>
>>  TEST_P(LinuxProcSMapsTestFixture, ParseSMapRegions) {
>>    auto params = GetParam();
>>
>> diff  --git a/llvm/include/llvm/Testing/Support/Error.h
>> b/llvm/include/llvm/Testing/Support/Error.h
>> index cd5b79cd6bfb0..67e9985b80f55 100644
>> --- a/llvm/include/llvm/Testing/Support/Error.h
>> +++ b/llvm/include/llvm/Testing/Support/Error.h
>> @@ -42,7 +42,7 @@ class ValueMatchesMono
>>
>>      bool result = Matcher.MatchAndExplain(*Holder.Exp, listener);
>>
>> -    if (result)
>> +    if (result || !listener->IsInterested())
>>        return result;
>>      *listener << "(";
>>      Matcher.DescribeNegationTo(listener->stream());
>>
>> diff  --git a/llvm/unittests/ADT/BitVectorTest.cpp
>> b/llvm/unittests/ADT/BitVectorTest.cpp
>> index 1779f2fcc9c27..858adb36f22e4 100644
>> --- a/llvm/unittests/ADT/BitVectorTest.cpp
>> +++ b/llvm/unittests/ADT/BitVectorTest.cpp
>> @@ -21,7 +21,7 @@ class BitVectorTest : public ::testing::Test { };
>>
>>  // Test both BitVector and SmallBitVector with the same suite of tests.
>>  typedef ::testing::Types<BitVector, SmallBitVector> BitVectorTestTypes;
>> -TYPED_TEST_CASE(BitVectorTest, BitVectorTestTypes);
>> +TYPED_TEST_SUITE(BitVectorTest, BitVectorTestTypes);
>>
>>  TYPED_TEST(BitVectorTest, TrivialOperation) {
>>    TypeParam Vec;
>>
>> diff  --git a/llvm/unittests/ADT/DenseMapTest.cpp
>> b/llvm/unittests/ADT/DenseMapTest.cpp
>> index 9cd974f5bac31..e9fe4cb8d5cd2 100644
>> --- a/llvm/unittests/ADT/DenseMapTest.cpp
>> +++ b/llvm/unittests/ADT/DenseMapTest.cpp
>> @@ -105,7 +105,7 @@ typedef ::testing::Types<DenseMap<uint32_t, uint32_t>,
>>                           SmallDenseMap<CtorTester, CtorTester, 4,
>>                                         CtorTesterMapInfo>
>>                           > DenseMapTestTypes;
>> -TYPED_TEST_CASE(DenseMapTest, DenseMapTestTypes);
>> +TYPED_TEST_SUITE(DenseMapTest, DenseMapTestTypes);
>>
>>  // Empty map tests
>>  TYPED_TEST(DenseMapTest, EmptyIntMapTest) {
>>
>> diff  --git a/llvm/unittests/ADT/DenseSetTest.cpp
>> b/llvm/unittests/ADT/DenseSetTest.cpp
>> index ada53cac9b78d..1320e283c59aa 100644
>> --- a/llvm/unittests/ADT/DenseSetTest.cpp
>> +++ b/llvm/unittests/ADT/DenseSetTest.cpp
>> @@ -68,7 +68,7 @@ typedef ::testing::Types<DenseSet<unsigned,
>> TestDenseSetInfo>,
>>                           const SmallDenseSet<unsigned, 4,
>> TestDenseSetInfo>,
>>                           SmallDenseSet<unsigned, 64, TestDenseSetInfo>>
>>      DenseSetTestTypes;
>> -TYPED_TEST_CASE(DenseSetTest, DenseSetTestTypes);
>> +TYPED_TEST_SUITE(DenseSetTest, DenseSetTestTypes);
>>
>>  TYPED_TEST(DenseSetTest, Constructor) {
>>    constexpr unsigned a[] = {1, 2, 4};
>>
>> diff  --git a/llvm/unittests/ADT/IListBaseTest.cpp
>> b/llvm/unittests/ADT/IListBaseTest.cpp
>> index 2983618f07e4a..f4783c46f4194 100644
>> --- a/llvm/unittests/ADT/IListBaseTest.cpp
>> +++ b/llvm/unittests/ADT/IListBaseTest.cpp
>> @@ -19,7 +19,7 @@ template <typename T> class IListBaseTest : public
>> ::testing::Test {};
>>  // Test variants with the same test.
>>  typedef ::testing::Types<ilist_base<false>, ilist_base<true>>
>>      IListBaseTestTypes;
>> -TYPED_TEST_CASE(IListBaseTest, IListBaseTestTypes);
>> +TYPED_TEST_SUITE(IListBaseTest, IListBaseTestTypes);
>>
>>  TYPED_TEST(IListBaseTest, insertBeforeImpl) {
>>    typedef TypeParam list_base_type;
>>
>> diff  --git a/llvm/unittests/ADT/IntrusiveRefCntPtrTest.cpp
>> b/llvm/unittests/ADT/IntrusiveRefCntPtrTest.cpp
>> index 0123709dcf2e3..e35b78484f53a 100644
>> --- a/llvm/unittests/ADT/IntrusiveRefCntPtrTest.cpp
>> +++ b/llvm/unittests/ADT/IntrusiveRefCntPtrTest.cpp
>> @@ -28,7 +28,7 @@ template <typename T> struct IntrusiveRefCntPtrTest :
>> testing::Test {};
>>  typedef ::testing::Types<SimpleRefCounted<RefCountedBase>,
>>                           SimpleRefCounted<ThreadSafeRefCountedBase>>
>>      IntrusiveRefCntTypes;
>> -TYPED_TEST_CASE(IntrusiveRefCntPtrTest, IntrusiveRefCntTypes);
>> +TYPED_TEST_SUITE(IntrusiveRefCntPtrTest, IntrusiveRefCntTypes);
>>
>>  TYPED_TEST(IntrusiveRefCntPtrTest, RefCountedBaseCopyDoesNotLeak) {
>>    EXPECT_EQ(0, NumInstances);
>>
>> diff  --git a/llvm/unittests/ADT/MapVectorTest.cpp
>> b/llvm/unittests/ADT/MapVectorTest.cpp
>> index 7a77df45bce8d..92583e940d9c1 100644
>> --- a/llvm/unittests/ADT/MapVectorTest.cpp
>> +++ b/llvm/unittests/ADT/MapVectorTest.cpp
>> @@ -162,7 +162,7 @@ template <class IntType> struct
>> MapVectorMappedTypeTest : ::testing::Test {
>>
>>  using MapIntTypes = ::testing::Types<int, long, long long, unsigned,
>>                                       unsigned long, unsigned long long>;
>> -TYPED_TEST_CASE(MapVectorMappedTypeTest, MapIntTypes);
>> +TYPED_TEST_SUITE(MapVectorMappedTypeTest, MapIntTypes);
>>
>>  TYPED_TEST(MapVectorMappedTypeTest, DifferentDenseMap) {
>>    // Test that using a map with a mapped type other than 'unsigned'
>> compiles
>>
>> diff  --git a/llvm/unittests/ADT/PriorityWorklistTest.cpp
>> b/llvm/unittests/ADT/PriorityWorklistTest.cpp
>> index 4dfdd5f9a2611..42dca48d62fc0 100644
>> --- a/llvm/unittests/ADT/PriorityWorklistTest.cpp
>> +++ b/llvm/unittests/ADT/PriorityWorklistTest.cpp
>> @@ -22,7 +22,7 @@ using namespace llvm;
>>  template <typename T> class PriorityWorklistTest : public
>> ::testing::Test {};
>>  typedef ::testing::Types<PriorityWorklist<int>,
>> SmallPriorityWorklist<int, 2>>
>>      TestTypes;
>> -TYPED_TEST_CASE(PriorityWorklistTest, TestTypes);
>> +TYPED_TEST_SUITE(PriorityWorklistTest, TestTypes);
>>
>>  TYPED_TEST(PriorityWorklistTest, Basic) {
>>    TypeParam W;
>>
>> diff  --git a/llvm/unittests/ADT/RangeAdapterTest.cpp
>> b/llvm/unittests/ADT/RangeAdapterTest.cpp
>> index eb1852639a3a6..ba37bcfd3d840 100644
>> --- a/llvm/unittests/ADT/RangeAdapterTest.cpp
>> +++ b/llvm/unittests/ADT/RangeAdapterTest.cpp
>> @@ -129,7 +129,7 @@ template <typename T> class RangeAdapterLValueTest :
>> public ::testing::Test {};
>>
>>  typedef ::testing::Types<std::vector<int>, std::list<int>, int[4]>
>>      RangeAdapterLValueTestTypes;
>> -TYPED_TEST_CASE(RangeAdapterLValueTest, RangeAdapterLValueTestTypes);
>> +TYPED_TEST_SUITE(RangeAdapterLValueTest, RangeAdapterLValueTestTypes);
>>
>>  TYPED_TEST(RangeAdapterLValueTest, TrivialOperation) {
>>    TypeParam v = {0, 1, 2, 3};
>> @@ -145,7 +145,7 @@ typedef ::testing::Types<std::vector<int>,
>> std::list<int>, CustomIteratorVector,
>>                           ReverseOnlyVector, BidirectionalVector,
>>                           BidirectionalVectorConsts>
>>      RangeAdapterRValueTestTypes;
>> -TYPED_TEST_CASE(RangeAdapterRValueTest, RangeAdapterRValueTestTypes);
>> +TYPED_TEST_SUITE(RangeAdapterRValueTest, RangeAdapterRValueTestTypes);
>>
>>  TYPED_TEST(RangeAdapterRValueTest, TrivialOperation) {
>>    TestRev(reverse(TypeParam({0, 1, 2, 3})));
>>
>> diff  --git a/llvm/unittests/ADT/STLForwardCompatTest.cpp
>> b/llvm/unittests/ADT/STLForwardCompatTest.cpp
>> index f85669516b79d..e8521fad26632 100644
>> --- a/llvm/unittests/ADT/STLForwardCompatTest.cpp
>> +++ b/llvm/unittests/ADT/STLForwardCompatTest.cpp
>> @@ -59,7 +59,7 @@ using STLForwardCompatRemoveCVRefTestTypes =
>> ::testing::Types<
>>      // clang-format on
>>      >;
>>
>> -TYPED_TEST_CASE(STLForwardCompatRemoveCVRefTest,
>> +TYPED_TEST_SUITE(STLForwardCompatRemoveCVRefTest,
>>                  STLForwardCompatRemoveCVRefTestTypes);
>>
>>  TYPED_TEST(STLForwardCompatRemoveCVRefTest, RemoveCVRef) {
>>
>> diff  --git a/llvm/unittests/ADT/SmallVectorTest.cpp
>> b/llvm/unittests/ADT/SmallVectorTest.cpp
>> index a533bb850a451..4673c659382d4 100644
>> --- a/llvm/unittests/ADT/SmallVectorTest.cpp
>> +++ b/llvm/unittests/ADT/SmallVectorTest.cpp
>> @@ -208,7 +208,7 @@ typedef ::testing::Types<SmallVector<Constructable,
>> 0>,
>>                           SmallVector<Constructable, 4>,
>>                           SmallVector<Constructable, 5>
>>                           > SmallVectorTestTypes;
>> -TYPED_TEST_CASE(SmallVectorTest, SmallVectorTestTypes);
>> +TYPED_TEST_SUITE(SmallVectorTest, SmallVectorTestTypes);
>>
>>  // Constructor test.
>>  TYPED_TEST(SmallVectorTest, ConstructorNonIterTest) {
>> @@ -811,7 +811,7 @@ typedef ::testing::Types<
>>      std::pair<SmallVector<Constructable, 2>, SmallVector<Constructable,
>> 2>>
>>    > DualSmallVectorTestTypes;
>>
>> -TYPED_TEST_CASE(DualSmallVectorsTest, DualSmallVectorTestTypes);
>> +TYPED_TEST_SUITE(DualSmallVectorsTest, DualSmallVectorTestTypes);
>>
>>  TYPED_TEST(DualSmallVectorsTest, MoveAssignment) {
>>    SCOPED_TRACE("MoveAssignTest-DualVectorTypes");
>> @@ -1095,7 +1095,7 @@ class SmallVectorReferenceInvalidationTest : public
>> SmallVectorTestBase {
>>  using SmallVectorReferenceInvalidationTestTypes =
>>      ::testing::Types<SmallVector<int, 3>, SmallVector<Constructable, 3>>;
>>
>> -TYPED_TEST_CASE(SmallVectorReferenceInvalidationTest,
>> +TYPED_TEST_SUITE(SmallVectorReferenceInvalidationTest,
>>                  SmallVectorReferenceInvalidationTestTypes);
>>
>>  TYPED_TEST(SmallVectorReferenceInvalidationTest, PushBack) {
>> @@ -1382,7 +1382,7 @@ using
>> SmallVectorInternalReferenceInvalidationTestTypes =
>>      ::testing::Types<SmallVector<std::pair<int, int>, 3>,
>>                       SmallVector<std::pair<Constructable,
>> Constructable>, 3>>;
>>
>> -TYPED_TEST_CASE(SmallVectorInternalReferenceInvalidationTest,
>> +TYPED_TEST_SUITE(SmallVectorInternalReferenceInvalidationTest,
>>                  SmallVectorInternalReferenceInvalidationTestTypes);
>>
>>  TYPED_TEST(SmallVectorInternalReferenceInvalidationTest, EmplaceBack) {
>>
>> diff  --git a/llvm/unittests/ADT/TinyPtrVectorTest.cpp
>> b/llvm/unittests/ADT/TinyPtrVectorTest.cpp
>> index f88534787c9e4..d59bd7f4c5b47 100644
>> --- a/llvm/unittests/ADT/TinyPtrVectorTest.cpp
>> +++ b/llvm/unittests/ADT/TinyPtrVectorTest.cpp
>> @@ -83,7 +83,7 @@ class TinyPtrVectorTest : public testing::Test {
>>  typedef ::testing::Types<TinyPtrVector<int *>, TinyPtrVector<double *>,
>>                           TinyPtrVector<PointerIntPair<int *, 1>>>
>>      TinyPtrVectorTestTypes;
>> -TYPED_TEST_CASE(TinyPtrVectorTest, TinyPtrVectorTestTypes);
>> +TYPED_TEST_SUITE(TinyPtrVectorTest, TinyPtrVectorTestTypes);
>>
>>  TYPED_TEST(TinyPtrVectorTest, EmptyTest) {
>>    this->expectValues(this->V, this->testArray(0));
>>
>> diff  --git a/llvm/unittests/Analysis/ValueTrackingTest.cpp
>> b/llvm/unittests/Analysis/ValueTrackingTest.cpp
>> index 99a0f6daa84db..2cfbc4cc65f55 100644
>> --- a/llvm/unittests/Analysis/ValueTrackingTest.cpp
>> +++ b/llvm/unittests/Analysis/ValueTrackingTest.cpp
>> @@ -1859,8 +1859,8 @@ const std::pair<const char *, const char *>
>> IsBytewiseValueTests[] = {
>>      },
>>  };
>>
>> -INSTANTIATE_TEST_CASE_P(IsBytewiseValueParamTests, IsBytewiseValueTest,
>> -                        ::testing::ValuesIn(IsBytewiseValueTests),);
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210515/1604e703/attachment.html>


More information about the llvm-commits mailing list