修改googletest版本

3rdparty/googletest-1.13.0/googletest/test/gtest_pred_impl_unittest.cc → 3rdparty/googletest-release-1.12.1/googletest/test/gtest_pred_impl_unittest.cc

@@ -45,7 +45,6 @@
 // stand-alone regression test.
 
 #include <iostream>
-#include <ostream>
 
 #include "gtest/gtest-spi.h"
 #include "gtest/gtest.h"

3rdparty/googletest-1.13.0/googletest/test/gtest_unittest.cc → 3rdparty/googletest-release-1.12.1/googletest/test/gtest_unittest.cc

@@ -61,7 +61,6 @@ TEST(CommandLineFlagsTest, CanBeAccessedInCodeOnceGTestHIsIncluded) {
 #include <cstdint>
 #include <map>
 #include <ostream>
-#include <set>
 #include <string>
 #include <type_traits>
 #include <unordered_set>
@@ -3455,10 +3454,10 @@ TEST_F(NoFatalFailureTest, MessageIsStreamable) {
   TestPartResultArray gtest_failures;
   {
     ScopedFakeTestPartResultReporter gtest_reporter(&gtest_failures);
-    EXPECT_NO_FATAL_FAILURE([] { FAIL() << "foo"; }()) << "my message";
+    EXPECT_NO_FATAL_FAILURE(FAIL() << "foo") << "my message";
   }
   ASSERT_EQ(2, gtest_failures.size());
-  EXPECT_EQ(TestPartResult::kFatalFailure,
+  EXPECT_EQ(TestPartResult::kNonFatalFailure,
             gtest_failures.GetTestPartResult(0).type());
   EXPECT_EQ(TestPartResult::kNonFatalFailure,
             gtest_failures.GetTestPartResult(1).type());
@@ -6637,9 +6636,6 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) {
   SetEnv("TERM", "xterm-color");      // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
-  SetEnv("TERM", "xterm-kitty");      // TERM supports colors.
-  EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
-
   SetEnv("TERM", "xterm-256color");   // TERM supports colors.
   EXPECT_TRUE(ShouldUseColor(true));  // Stdout is a TTY.
 
@@ -7707,7 +7703,7 @@ auto* dynamic_test = testing::RegisterTest(
     __LINE__, []() -> DynamicUnitTestFixture* { return new DynamicTest; });
 
 TEST(RegisterTest, WasRegistered) {
-  const auto& unittest = testing::UnitTest::GetInstance();
+  auto* unittest = testing::UnitTest::GetInstance();
   for (int i = 0; i < unittest->total_test_suite_count(); ++i) {
     auto* tests = unittest->GetTestSuite(i);
     if (tests->name() != std::string("DynamicUnitTestFixture")) continue;

3rdparty/googletest-1.13.0/googletest/test/gtest_xml_outfile2_test_.cc → 3rdparty/googletest-release-1.12.1/googletest/test/gtest_xml_outfile2_test_.cc

@@ -39,7 +39,5 @@ class PropertyTwo : public testing::Test {
 };
 
 TEST_F(PropertyTwo, TestSomeProperties) {
-  // Validate we can write an unsigned size_t as a property
-  size_t prop_two = 2;
-  RecordProperty("TestSomeProperty", prop_two);
+  RecordProperty("TestSomeProperty", 2);
 }