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