deps: bump up googletest to v1.17.0

agrawroh · agrawroh · commit 6dc2b060c6b8 · 2025-05-02T08:48:26.000-07:00
Signed-off-by: Rohit Agrawal &lt;rohit.agrawal@databricks.com&gt;
diff --git a/bazel/googletest.patch b/bazel/googletest.patch
@@ -1,13 +1,44 @@
+From b217f1131adb21e2c1193782d2659ae03840659a Mon Sep 17 00:00:00 2001
+From: Rohit Agrawal <rohit.agrawal@databricks.com>
+Date: Sat, 3 May 2025 00:29:17 +0900
+Subject: [PATCH] Patches
+
+---
+ BUILD.bazel | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
 diff --git a/BUILD.bazel b/BUILD.bazel
-index 8099642a85..3598661079 100644
+index 53501454ce..fff6e491e7 100644
 --- a/BUILD.bazel
 +++ b/BUILD.bazel
-@@ -40,7 +40,7 @@ exports_files(["LICENSE"])
-
- config_setting(
-     name = "windows",
--    constraint_values = ["@bazel_tools//platforms:windows"],
-+    constraint_values = ["@platforms//os:windows"],
+@@ -56,12 +56,6 @@ config_setting(
+     constraint_values = ["@platforms//os:openbsd"],
  )
-
+ 
+-# NOTE: Fuchsia is not an officially supported platform.
+-config_setting(
+-    name = "fuchsia",
+-    constraint_values = ["@platforms//os:fuchsia"],
+-)
+-
  config_setting(
+     name = "msvc_compiler",
+     flag_values = {
+@@ -157,17 +151,6 @@ cc_library(
+             "@re2//:re2",
+         ],
+         "//conditions:default": [],
+-    }) + select({
+-        # `gtest-death-test.cc` has `EXPECT_DEATH` that spawns a process,
+-        # expects it to crash and inspects its logs with the given matcher,
+-        # so that's why these libraries are needed.
+-        # Otherwise, builds targeting Fuchsia would fail to compile.
+-        ":fuchsia": [
+-            "@fuchsia_sdk//pkg/fdio",
+-            "@fuchsia_sdk//pkg/syslog",
+-            "@fuchsia_sdk//pkg/zx",
+-        ],
+-        "//conditions:default": [],
+     }),
+ )
+ 
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
@@ -571,9 +571,10 @@ def _com_github_ncopa_suexec():
 
 def _com_google_googletest():
     external_http_archive(
-        "com_google_googletest",
+        name = "com_google_googletest",
         patches = ["@envoy//bazel:googletest.patch"],
         patch_args = ["-p1"],
+        repo_mapping = {"@abseil-cpp": "@com_google_absl", "@re2": "@com_googlesource_code_re2"},
     )
 
 # TODO(jmarantz): replace the use of bind and external_deps with just
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -910,13 +910,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "Google Test",
         project_desc = "Google's C++ test framework",
         project_url = "https://github.com/google/googletest",
-        # Pick up fix for MOCK_METHOD compilation with clang-cl for Windows (resolved after 1.10.0)
-        # see https://github.com/google/googletest/issues/2490
-        version = "a4ab0abb93620ce26efad9de9296b73b16e88588",
-        sha256 = "7897bfaa5ad39a479177cfb5c3ce010184dbaee22a7c3727b212282871918751",
+        version = "1.17.0",
+        sha256 = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c",
         strip_prefix = "googletest-{version}",
-        urls = ["https://github.com/google/googletest/archive/{version}.tar.gz"],
-        release_date = "2020-09-10",
+        urls = ["https://github.com/google/googletest/releases/download/v{version}/googletest-{version}.tar.gz"],
+        release_date = "2025-04-30",
         use_category = ["test_only"],
         cpe = "cpe:2.3:a:google:google_test:*",
         license = "BSD-3-Clause",
diff --git a/test/common/common/BUILD b/test/common/common/BUILD
@@ -207,6 +207,8 @@ envoy_cc_test(
     rbe_pool = "6gig",
     deps = [
         "//source/common/common:minimal_logger_lib",
+        "//test/mocks/http:http_mocks",
+        "//test/mocks/network:network_mocks",
         "//test/test_common:logging_lib",
     ],
 )
diff --git a/test/common/http/header_mutation_test.cc b/test/common/http/header_mutation_test.cc
@@ -276,7 +276,7 @@ TEST(HeaderMutationTest, Death) {
   ProtoHeaderMutatons proto_mutations;
   proto_mutations.Add();
 
-  EXPECT_DEATH(HeaderMutations::create(proto_mutations).IgnoreError(), "unset oneof");
+  EXPECT_DEATH(HeaderMutations::create(proto_mutations).IgnoreError(), ".*unset oneof.*");
 }
 
 } // namespace
diff --git a/test/common/quic/envoy_quic_proof_verifier_test.cc b/test/common/quic/envoy_quic_proof_verifier_test.cc
@@ -446,7 +446,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProof) {
   configCertVerificationDetails(true);
   EXPECT_DEATH(verifier_->VerifyProof("", 0, "", quic::QUIC_VERSION_IETF_RFC_V1, "", {}, "", "",
                                       nullptr, nullptr, nullptr, {}),
-               "not implemented");
+               ".*not implemented.*");
 }
 
 TEST_F(EnvoyQuicProofVerifierTest, CreateDefaultContext) {
diff --git a/test/common/quic/quic_filter_manager_connection_impl_test.cc b/test/common/quic/quic_filter_manager_connection_impl_test.cc
@@ -114,7 +114,7 @@ TEST_F(QuicFilterManagerConnectionImplTest, RawWrite) {
 }
 
 TEST_F(QuicFilterManagerConnectionImplTest, BufferLimit) {
-  EXPECT_DEATH(impl_.bufferLimit(), "not implemented");
+  EXPECT_DEATH(impl_.bufferLimit(), ".*not implemented.*");
 }
 
 TEST_F(QuicFilterManagerConnectionImplTest, SetBufferLimits) {
@@ -127,12 +127,11 @@ TEST_F(QuicFilterManagerConnectionImplTest, CloseConnection) {
 }
 
 TEST_F(QuicFilterManagerConnectionImplTest, GetWriteBuffer) {
-  EXPECT_DEATH(impl_.getWriteBuffer(), "not implemented");
+  EXPECT_DEATH(impl_.getWriteBuffer(), ".*not implemented.*");
 }
 
 TEST_F(QuicFilterManagerConnectionImplTest, EnableHalfClose) {
-  impl_.enableHalfClose(false); // No-op
-  EXPECT_DEATH(impl_.enableHalfClose(true), "Quic connection doesn't support half close.");
+  EXPECT_DEATH(impl_.enableHalfClose(true), ".*Quic connection doesn't support half close.*");
 }
 
 TEST_F(QuicFilterManagerConnectionImplTest, IsHalfCloseEnabled) {
diff --git a/test/common/runtime/BUILD b/test/common/runtime/BUILD
@@ -64,6 +64,7 @@ envoy_cc_test(
     name = "runtime_flag_override_test",
     srcs = ["runtime_flag_override_test.cc"],
     args = [
+        "--",
         "--runtime-feature-override-for-tests=envoy.reloadable_features.test_feature_false",
         "--runtime-feature-disable-for-tests=envoy.reloadable_features.test_feature_true",
     ],
@@ -78,6 +79,7 @@ envoy_cc_test(
     name = "runtime_flag_override_noop_test",
     srcs = ["runtime_flag_override_noop_test.cc"],
     args = [
+        "--",
         "--runtime-feature-override-for-tests=envoy.reloadable_features.test_feature_true",
         "--runtime-feature-disable-for-tests=envoy.reloadable_features.test_feature_false",
     ],
diff --git a/test/extensions/filters/http/kill_request/kill_request_filter_test.cc b/test/extensions/filters/http/kill_request/kill_request_filter_test.cc
@@ -47,7 +47,7 @@ TEST_F(KillRequestFilterTest, KillRequestCrashEnvoy) {
 
   ON_CALL(random_generator_, random()).WillByDefault(Return(0));
   EXPECT_DEATH(filter_->decodeHeaders(request_headers_, false),
-               "KillRequestFilter is crashing Envoy!!!");
+               ".*KillRequestFilter is crashing Envoy!!!.*");
 }
 
 TEST_F(KillRequestFilterTest, KillRequestCrashEnvoyWithCustomKillHeader) {
@@ -59,7 +59,7 @@ TEST_F(KillRequestFilterTest, KillRequestCrashEnvoyWithCustomKillHeader) {
 
   ON_CALL(random_generator_, random()).WillByDefault(Return(0));
   EXPECT_DEATH(filter_->decodeHeaders(request_headers_, false),
-               "KillRequestFilter is crashing Envoy!!!");
+               ".*KillRequestFilter is crashing Envoy!!!.*");
 }
 
 TEST_F(KillRequestFilterTest, KillRequestWithMillionDenominatorCrashEnvoy) {
@@ -183,7 +183,7 @@ TEST_F(KillRequestFilterTest, CanKillOnResponse) {
   ON_CALL(random_generator_, random()).WillByDefault(Return(0));
   response_headers_.addCopy("x-envoy-kill-request", "true");
   EXPECT_DEATH(filter_->encodeHeaders(response_headers_, false),
-               "KillRequestFilter is crashing Envoy!!!");
+               ".*KillRequestFilter is crashing Envoy!!!.*");
 }
 
 TEST_F(KillRequestFilterTest, KillsBasedOnDirection) {
@@ -201,7 +201,7 @@ TEST_F(KillRequestFilterTest, KillsBasedOnDirection) {
   ON_CALL(random_generator_, random()).WillByDefault(Return(0));
   response_headers_.addCopy("x-envoy-kill-request", "true");
   EXPECT_DEATH(filter_->encodeHeaders(response_headers_, false),
-               "KillRequestFilter is crashing Envoy!!!");
+               ".*KillRequestFilter is crashing Envoy!!!.*");
 }
 
 TEST_F(KillRequestFilterTest, PerRouteKillSettingFound) {
diff --git a/test/extensions/matching/input_matchers/cel_matcher/cel_matcher_test.cc b/test/extensions/matching/input_matchers/cel_matcher/cel_matcher_test.cc
@@ -562,7 +562,7 @@ TEST_F(CelMatcherTest, CelMatcherRequestResponseNotMatchedWithParsedExprUseCel)
 
 TEST_F(CelMatcherTest, NoCelExpression) {
   EXPECT_DEATH(buildMatcherTree(RequestHeaderCelExprString, ExpressionType::NoExpression),
-               ".*panic: unset oneof.*");
+               ".*unset oneof.*");
 }
 
 } // namespace CelMatcher
diff --git a/test/fuzz/fuzz_runner.cc b/test/fuzz/fuzz_runner.cc
@@ -87,7 +87,7 @@ void runCleanupHooks() {
 extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv) {
   // Before parsing gmock flags, set the default value of flag --gmock_verbose to "error".
   // This suppresses logs from NiceMock objects, which can be noisy and provide little value.
-  testing::GMOCK_FLAG(verbose) = "error";
+  GMOCK_FLAG_SET(verbose, "error");
   testing::InitGoogleMock(argc, *argv);
   Envoy::Fuzz::Runner::setupEnvironment(1, *argv, spdlog::level::critical);
   atexit(Envoy::Fuzz::runCleanupHooks);
diff --git a/test/integration/BUILD b/test/integration/BUILD
@@ -1142,7 +1142,7 @@ envoy_cc_test_library(
     hdrs = [
         "fake_upstream.h",
     ],
-    rbe_pool = "6gig",
+    rbe_pool = "12gig",  # Increased from 6gig to prevent OOM kills during compilation
     deps = [
         ":utility_lib",
         "//envoy/api:api_interface",
@@ -1222,7 +1222,7 @@ envoy_cc_test_library(
     hdrs = [
         "base_integration_test.h",
     ],
-    rbe_pool = "6gig",
+    rbe_pool = "12gig",  # Increased from 6gig to prevent OOM kills during compilation
     deps = [
         ":async_round_robin_lb",
         ":autonomous_upstream_lib",
@@ -1267,7 +1267,7 @@ envoy_cc_test_library(
     hdrs = [
         "autonomous_upstream.h",
     ],
-    rbe_pool = "6gig",
+    rbe_pool = "12gig",  # Increased from 6gig to prevent OOM kills during compilation
     deps = [
         ":fake_upstream_lib",
     ],
diff --git a/test/integration/tcp_proxy_odcds_integration_test.cc b/test/integration/tcp_proxy_odcds_integration_test.cc
@@ -163,7 +163,7 @@ TEST_P(TcpProxyOdcdsIntegrationTest, SingleTcpClient) {
   ASSERT_TRUE(fake_upstream_connection->waitForDisconnect());
   tcp_client->waitForHalfClose();
   tcp_client->close();
-  assertOnDemandCounters(1, 0, 0);
+  ASSERT_TRUE(assertOnDemandCounters(1, 0, 0));
 }
 
 // Verify only one delta xds response is needed for multiple tcp_proxy requests.
@@ -249,7 +249,7 @@ TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownConnectionOnTimeout) {
 
   tcp_client->waitForHalfClose();
   tcp_client->close();
-  assertOnDemandCounters(0, 0, 1);
+  ASSERT_TRUE(assertOnDemandCounters(0, 0, 1));
 }
 
 TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownConnectionOnClusterMissing) {
@@ -277,7 +277,7 @@ TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownConnectionOnClusterMissing) {
 
   tcp_client->waitForHalfClose();
   tcp_client->close();
-  assertOnDemandCounters(0, 1, 0);
+  ASSERT_TRUE(assertOnDemandCounters(0, 1, 0));
 }
 
 TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownAllConnectionsOnClusterLookupTimeout) {
@@ -306,7 +306,7 @@ TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownAllConnectionsOnClusterLookupTimeou
 
   tcp_client_1->waitForHalfClose(true);
   tcp_client_2->waitForHalfClose(true);
-  assertOnDemandCounters(0, 0, 2);
+  ASSERT_TRUE(assertOnDemandCounters(0, 0, 2));
   tcp_client_1->close();
   tcp_client_2->close();
 }
@@ -331,7 +331,7 @@ TEST_P(TcpProxyOdcdsIntegrationTest, ShutdownTcpClientBeforeOdcdsResponse) {
   EXPECT_EQ(1, test_server_->counter("tcp.tcpproxy_stats.on_demand_cluster_attempt")->value());
   // Client disconnect when the tcp proxy is waiting for the on demand response.
   tcp_client->close();
-  assertOnDemandCounters(0, 0, 0);
+  ASSERT_TRUE(assertOnDemandCounters(0, 0, 0));
 }
 
 } // namespace
diff --git a/test/server/guarddog_impl_test.cc b/test/server/guarddog_impl_test.cc
@@ -93,6 +93,11 @@ class GuardDogDeathTest : public GuardDogTestBase {
         config_multikill_(1000, 1000, 1000, 500, 0, std::vector<std::string>{}),
         config_multikill_threshold_(1000, 1000, 1000, 500, 60, std::vector<std::string>{}) {}
 
+  void SetUp() override {
+    GTEST_FLAG_SET(death_test_style, "threadsafe");
+    GuardDogTestBase::SetUp();
+  }
+
   /**
    * This does everything but the final forceCheckForTest() that should cause
    * death for the single kill case.
diff --git a/test/test_common/test_random_generator.cc b/test/test_common/test_random_generator.cc
@@ -1,22 +1,22 @@
 #include "test/test_common/test_random_generator.h"
 
+#include "absl/flags/flag.h"
 #include "gtest/gtest.h"
-
-using testing::GTEST_FLAG(random_seed);
+#include "gtest/internal/gtest-port.h" // for GTEST_FLAG_GET
 
 namespace Envoy {
 
 // The purpose of using the static seed here is to use --test_arg=--gtest_random_seed=[seed]
-// to specify the seed of the problem to replay.
+// to specify the seed for a given test run.
 int32_t getSeed() {
-  static const int32_t seed = std::chrono::duration_cast<std::chrono::nanoseconds>(
+  return static_cast<int32_t>(std::chrono::duration_cast<std::chrono::nanoseconds>(
                                   std::chrono::system_clock::now().time_since_epoch())
-                                  .count();
-  return seed;
+                                  .count());
 }
 
 TestRandomGenerator::TestRandomGenerator()
-    : seed_(GTEST_FLAG(random_seed) == 0 ? getSeed() : GTEST_FLAG(random_seed)), generator_(seed_) {
+    : seed_(GTEST_FLAG_GET(random_seed) == 0 ? getSeed() : GTEST_FLAG_GET(random_seed)),
+      generator_(seed_) {
   ENVOY_LOG_MISC(info, "TestRandomGenerator running with seed {}", seed_);
 }
 
diff --git a/test/test_runner.cc b/test/test_runner.cc
@@ -15,6 +15,8 @@
 #include "test/test_listener.h"
 
 #include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "gtest/internal/gtest-port.h" // for GTEST_FLAG_SET
 
 namespace Envoy {
 
@@ -90,7 +92,7 @@ int TestRunner::runTests(int argc, char** argv) {
 
   // Use the recommended, but not default, "threadsafe" style for the Death Tests.
   // See: https://github.com/google/googletest/commit/84ec2e0365d791e4ebc7ec249f09078fb5ab6caa
-  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+  GTEST_FLAG_SET(death_test_style, "threadsafe");
 
   // Set gtest properties
   // (https://github.com/google/googletest/blob/master/googletest/docs/advanced.md#logging-additional-information),

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,8 @@ envoy_cc_test(`
`207`	`207`	`rbe_pool = "6gig",`
`208`	`208`	`deps = [`
`209`	`209`	`"//source/common/common:minimal_logger_lib",`
	`210`	`+ "//test/mocks/http:http_mocks",`
	`211`	`+ "//test/mocks/network:network_mocks",`
`210`	`212`	`"//test/test_common:logging_lib",`
`211`	`213`	`],`
`212`	`214`	`)`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ TEST(HeaderMutationTest, Death) {`
`276`	`276`	`ProtoHeaderMutatons proto_mutations;`
`277`	`277`	`proto_mutations.Add();`
`278`	`278`
`279`		`- EXPECT_DEATH(HeaderMutations::create(proto_mutations).IgnoreError(), "unset oneof");`
	`279`	`+ EXPECT_DEATH(HeaderMutations::create(proto_mutations).IgnoreError(), ".unset oneof.");`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`} // namespace`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProof) {`
`446`	`446`	`configCertVerificationDetails(true);`
`447`	`447`	`EXPECT_DEATH(verifier_->VerifyProof("", 0, "", quic::QUIC_VERSION_IETF_RFC_V1, "", {}, "", "",`
`448`	`448`	`nullptr, nullptr, nullptr, {}),`
`449`		`- "not implemented");`
	`449`	`+ ".not implemented.");`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`TEST_F(EnvoyQuicProofVerifierTest, CreateDefaultContext) {`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ TEST_F(QuicFilterManagerConnectionImplTest, RawWrite) {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`TEST_F(QuicFilterManagerConnectionImplTest, BufferLimit) {`
`117`		`- EXPECT_DEATH(impl_.bufferLimit(), "not implemented");`
	`117`	`+ EXPECT_DEATH(impl_.bufferLimit(), ".not implemented.");`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`TEST_F(QuicFilterManagerConnectionImplTest, SetBufferLimits) {`
`@@ -127,12 +127,11 @@ TEST_F(QuicFilterManagerConnectionImplTest, CloseConnection) {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`TEST_F(QuicFilterManagerConnectionImplTest, GetWriteBuffer) {`
`130`		`- EXPECT_DEATH(impl_.getWriteBuffer(), "not implemented");`
	`130`	`+ EXPECT_DEATH(impl_.getWriteBuffer(), ".not implemented.");`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`TEST_F(QuicFilterManagerConnectionImplTest, EnableHalfClose) {`
`134`		`- impl_.enableHalfClose(false); // No-op`
`135`		`- EXPECT_DEATH(impl_.enableHalfClose(true), "Quic connection doesn't support half close.");`
	`134`	`+ EXPECT_DEATH(impl_.enableHalfClose(true), ".Quic connection doesn't support half close.");`
`136`	`135`	`}`
`137`	`136`
`138`	`137`	`TEST_F(QuicFilterManagerConnectionImplTest, IsHalfCloseEnabled) {`
Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ TEST_F(CelMatcherTest, CelMatcherRequestResponseNotMatchedWithParsedExprUseCel)`
`562`	`562`
`563`	`563`	`TEST_F(CelMatcherTest, NoCelExpression) {`
`564`	`564`	`EXPECT_DEATH(buildMatcherTree(RequestHeaderCelExprString, ExpressionType::NoExpression),`
`565`		`- ".panic: unset oneof.");`
	`565`	`+ ".unset oneof.");`
`566`	`566`	`}`
`567`	`567`
`568`	`568`	`} // namespace CelMatcher`