Update googletest code in third_party to v1.12.1 (#1238)

It is the last version to support C++11
p4lang · Apr 11, 2024 · 5f5818b · 5f5818b
1 parent c74c536
commit 5f5818b
Show file tree

Hide file tree

Showing 53 changed files with 10,646 additions and 17,164 deletions.
diff --git a/tests/test_actions.cpp b/tests/test_actions.cpp
@@ -719,7 +719,7 @@ class ActionsStringParamTest : public ActionsTest {
 };
 
 using SaveStringTypes = ::testing::Types<SaveString, SaveCString>;
-TYPED_TEST_CASE(ActionsStringParamTest, SaveStringTypes);
+TYPED_TEST_SUITE(ActionsStringParamTest, SaveStringTypes);
 
 TYPED_TEST(ActionsStringParamTest, Basic) {
   const std::string testString("testString");

diff --git a/tests/test_assert_assume.cpp b/tests/test_assert_assume.cpp
@@ -88,9 +88,9 @@ TEST_P(AssertAssumeDeathTest, ConditionFalse) {
   EXPECT_DEATH(testActionFnEntry(pkt.get()), "");
 }
 
-INSTANTIATE_TEST_CASE_P(AssertAssumeTest,
-                        AssertAssumeTest,
-                        ::testing::Values("assert", "assume"));
-INSTANTIATE_TEST_CASE_P(AssertAssumeDeathTest,
-                        AssertAssumeDeathTest,
-                        ::testing::Values("assert", "assume"));
+INSTANTIATE_TEST_SUITE_P(AssertAssumeTest,
+                         AssertAssumeTest,
+                         ::testing::Values("assert", "assume"));
+INSTANTIATE_TEST_SUITE_P(AssertAssumeDeathTest,
+                         AssertAssumeDeathTest,
+                         ::testing::Values("assert", "assume"));
diff --git a/tests/test_calculations.cpp b/tests/test_calculations.cpp
@@ -682,7 +682,7 @@ TEST_P(CrcMapTest, Check) {
   EXPECT_EQ(expected_output, output);
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     CrcMapList, CrcMapTest,
     ::testing::ValuesIn(CrcCheckMap::get_instance()->names()));
 

diff --git a/tests/test_devmgr.cpp b/tests/test_devmgr.cpp
@@ -548,7 +548,7 @@ PortMonitorTest<PMActive>::set_port_status(port_t port, PortStatus status) {
 
 using PMTypes = Types<PMPassive, PMActive>;
 
-TYPED_TEST_CASE(PortMonitorTest, PMTypes);
+TYPED_TEST_SUITE(PortMonitorTest, PMTypes);
 
 using std::chrono::milliseconds;
 using std::this_thread::sleep_for;

diff --git a/tests/test_extern.cpp b/tests/test_extern.cpp
@@ -397,7 +397,7 @@ TEST_P(ExternTestTestRegister, TestRegister) {
   ASSERT_EQ(expected, dst.get<int>());
 }
 
-INSTANTIATE_TEST_CASE_P(RegisterExternFunction, ExternTestTestRegister,
+INSTANTIATE_TEST_SUITE_P(RegisterExternFunction, ExternTestTestRegister,
   ::testing::Values(
     std::make_pair("set_field1", 1),
     std::make_pair("set_field2_test", 2),

diff --git a/tests/test_fields.cpp b/tests/test_fields.cpp
@@ -175,14 +175,14 @@ TEST_P(FieldSerializeTest, DeparseWSentinel) {
   run_deparse_test(1);
 }
 
-INSTANTIATE_TEST_CASE_P(TestParameters,
-                        FieldSerializeTest,
-                        Combine(Range(1, 17), Range(0, 8)));
+INSTANTIATE_TEST_SUITE_P(TestParameters,
+                         FieldSerializeTest,
+                         Combine(Range(1, 17), Range(0, 8)));
 
 // one bug only appeared for fields > 2 bytes, thus this addition
-INSTANTIATE_TEST_CASE_P(TestParameters2,
-                        FieldSerializeTest,
-                        Combine(Values(18), Range(0, 8)));
+INSTANTIATE_TEST_SUITE_P(TestParameters2,
+                         FieldSerializeTest,
+                         Combine(Values(18), Range(0, 8)));
 
 
 namespace {
@@ -250,9 +250,9 @@ TEST_P(SignedFieldTest, ExportBytes) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(TestParameters,
-                        SignedFieldTest,
-                        Range(2, 17));
+INSTANTIATE_TEST_SUITE_P(TestParameters,
+                         SignedFieldTest,
+                         Range(2, 17));
 
 
 class SaturatingFieldTest : public ::testing::Test {

diff --git a/tests/test_handle_mgr.cpp b/tests/test_handle_mgr.cpp
@@ -41,7 +41,7 @@ class HandleMgrIteratorTest : public ::testing::Test {
 
 using IteratorTypes = Types<HandleMgr::iterator, HandleMgr::const_iterator>;
 
-TYPED_TEST_CASE(HandleMgrIteratorTest, IteratorTypes);
+TYPED_TEST_SUITE(HandleMgrIteratorTest, IteratorTypes);
 
 TYPED_TEST(HandleMgrIteratorTest, Iterate) {
   HandleMgr handle_mgr;

diff --git a/tests/test_header_stacks.cpp b/tests/test_header_stacks.cpp
@@ -126,7 +126,7 @@ class HeaderStackTest : public ::testing::Test {
 using HeaderStackTypes =
     ::testing::Types<HeaderStackLegacy, HeaderStackP4_16<true> >;
 
-TYPED_TEST_CASE(HeaderStackTest, HeaderStackTypes);
+TYPED_TEST_SUITE(HeaderStackTest, HeaderStackTypes);
 
 TYPED_TEST(HeaderStackTest, Basic) {
   auto &stack = this->stack;

diff --git a/tests/test_parser.cpp b/tests/test_parser.cpp
@@ -1254,8 +1254,8 @@ TEST_P(IPv4VLParsingTest, ParseAndDeparse) {
   ASSERT_EQ(0, memcmp(buf_save.data(), packet.data(), buf_save.size()));
 }
 
-INSTANTIATE_TEST_CASE_P(IPv4VLOptionWords, IPv4VLParsingTest,
-                        Range(0, 10));
+INSTANTIATE_TEST_SUITE_P(IPv4VLOptionWords, IPv4VLParsingTest,
+                         Range(0, 10));
 
 
 class ParseVSetTest : public ::testing::Test {

diff --git a/tests/test_phv.cpp b/tests/test_phv.cpp
@@ -253,7 +253,7 @@ class PHVHeaderNameIteratorTest : public PHVTest {
 using NameIteratorTypes = Types<PHV::header_name_iterator,
                                 PHV::const_header_name_iterator>;
 
-TYPED_TEST_CASE(PHVHeaderNameIteratorTest, NameIteratorTypes);
+TYPED_TEST_SUITE(PHVHeaderNameIteratorTest, NameIteratorTypes);
 
 TYPED_TEST(PHVHeaderNameIteratorTest, Iterate) {
   typename PHVRef<TypeParam>::type phv_ref = *(this->phv).get();
@@ -285,7 +285,7 @@ class PHVHeaderIteratorTest : public PHVTest {
 
 using IteratorTypes = Types<PHV::header_iterator, PHV::const_header_iterator>;
 
-TYPED_TEST_CASE(PHVHeaderIteratorTest, IteratorTypes);
+TYPED_TEST_SUITE(PHVHeaderIteratorTest, IteratorTypes);
 
 template <typename IteratorType>
 struct HeaderRef { };

diff --git a/tests/test_queue.cpp b/tests/test_queue.cpp
@@ -86,7 +86,7 @@ TEST_P(QueueTest, ProducerConsumer) {
 }
 
 
-INSTANTIATE_TEST_CASE_P(TestParameters,
-                        QueueTest,
-                        Combine(Values(16, 1024, 20000),
-                                Values(1000, 200000)));
+INSTANTIATE_TEST_SUITE_P(TestParameters,
+                         QueueTest,
+                         Combine(Values(16, 1024, 20000),
+                                 Values(1000, 200000)));
diff --git a/tests/test_queueing.cpp b/tests/test_queueing.cpp
@@ -124,7 +124,7 @@ using QueueingTypes = Types<QueueingLogic<QEm, WorkerMapper>,
                             QueueingLogicRL<QEm, WorkerMapper>,
                             QueueingLogicPriRL<QEm, WorkerMapper> >;
 
-TYPED_TEST_CASE(QueueingTest, QueueingTypes);
+TYPED_TEST_SUITE(QueueingTest, QueueingTypes);
 
 TYPED_TEST(QueueingTest, ProducerConsummer) {
   thread producer_thread(&QueueingTest<TypeParam>::produce, this);

diff --git a/tests/test_tables.cpp b/tests/test_tables.cpp
@@ -281,7 +281,7 @@ using MUTypes = Types<MUExact,
                       MUTernary,
                       MURange>;
 
-TYPED_TEST_CASE(TableSizeTwo, MUTypes);
+TYPED_TEST_SUITE(TableSizeTwo, MUTypes);
 
 TYPED_TEST(TableSizeTwo, AddEntry) {
   std::string key_1 = "\xaa\xaa";
@@ -2163,7 +2163,7 @@ TableBigMask<MURange>::make_key_builder() {
                               MatchKeyParam::Type::EXACT);
 }
 
-TYPED_TEST_CASE(TableBigMask, MUTypes);
+TYPED_TEST_SUITE(TableBigMask, MUTypes);
 
 TYPED_TEST(TableBigMask, HitMiss) {
   const std::string key_1 = "\x11\x22";
@@ -2797,7 +2797,7 @@ std::string TableEntryDebug<MURange>::gen_entry_string() const {
       "Action entry: actionA - aba,\n");
 }
 
-TYPED_TEST_CASE(TableEntryDebug, MUTypes);
+TYPED_TEST_SUITE(TableEntryDebug, MUTypes);
 
 namespace {
 
@@ -3151,7 +3151,7 @@ TableBadInputKey<MURange>::gen_match_key() const {
   return match_key;
 }
 
-TYPED_TEST_CASE(TableBadInputKey, MUTypes);
+TYPED_TEST_SUITE(TableBadInputKey, MUTypes);
 
 TYPED_TEST(TableBadInputKey, NonByteAligned) {
   entry_handle_t handle, lookup_handle;
@@ -3560,7 +3560,7 @@ TableDefaultDefaultEntryTest<MatchTableIndirect>::set_default_entry(
 }
 
 using MTTypes = Types<MatchTable, MatchTableIndirect>;
-TYPED_TEST_CASE(TableDefaultDefaultEntryTest, MTTypes);
+TYPED_TEST_SUITE(TableDefaultDefaultEntryTest, MTTypes);
 
 TYPED_TEST(TableDefaultDefaultEntryTest, DefaultEntryLookup) {
   auto pkt = this->get_pkt();

diff --git a/third_party/gtest/Makefile.am b/third_party/gtest/Makefile.am
@@ -13,20 +13,19 @@ include/gtest/internal/gtest-internal.h \
 include/gtest/internal/gtest-port-arch.h \
 include/gtest/internal/gtest-port.h \
 include/gtest/internal/gtest-type-util.h \
-include/gtest/internal/gtest-tuple.h \
-include/gtest/internal/gtest-linked_ptr.h \
 include/gtest/internal/gtest-string.h \
 include/gtest/internal/gtest-filepath.h \
 include/gtest/internal/gtest-param-util.h \
 include/gtest/internal/gtest-death-test-internal.h \
-include/gtest/internal/gtest-param-util-generated.h \
 include/gtest/gtest-param-test.h \
 include/gtest/gtest-typed-test.h \
 include/gtest/gtest-message.h \
 include/gtest/gtest_prod.h \
 include/gtest/gtest_pred_impl.h \
 include/gtest/gtest-spi.h \
-include/gtest/gtest-death-test.h
+include/gtest/gtest-death-test.h \
+include/gtest/gtest-assertion-result.h \
+include/gtest/gtest-matchers.h
 
 EXTRA_DIST += \
 src/gtest-test-part.cc \
@@ -37,6 +36,8 @@ src/gtest_main.cc \
 src/gtest-death-test.cc \
 src/gtest.cc \
 src/gtest-printers.cc \
+src/gtest-assertion-result.cc \
+src/gtest-matchers.cc \
 src/gtest-internal-inl.h
 
 libgtest_la_SOURCES = \