diff --git a/CMakeLists.txt b/CMakeLists.txt index 66fdb4e93ee..109dd40e69e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3386,9 +3386,15 @@ target_include_directories(gtest ) target_link_libraries(gtest ${_gRPC_ALLTARGETS_LIBRARIES} + ${_gRPC_RE2_LIBRARIES} + absl::flat_hash_set absl::failure_signal_handler absl::stacktrace absl::symbolize + absl::flags + absl::flags_parse + absl::flags_reflection + absl::flags_usage absl::strings absl::any absl::optional @@ -5596,7 +5602,6 @@ target_include_directories(activity_test target_link_libraries(activity_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::flat_hash_set absl::hash absl::type_traits absl::statusor @@ -8790,7 +8795,6 @@ target_link_libraries(chunked_vector_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest upb - absl::flat_hash_set absl::function_ref absl::hash absl::type_traits @@ -11876,7 +11880,6 @@ target_link_libraries(flow_control_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest upb - absl::flat_hash_set absl::function_ref absl::hash absl::type_traits @@ -11947,7 +11950,6 @@ target_link_libraries(for_each_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest upb - absl::flat_hash_set absl::function_ref absl::hash absl::type_traits @@ -14590,7 +14592,6 @@ target_link_libraries(interceptor_list_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest upb - absl::flat_hash_set absl::function_ref absl::hash absl::type_traits @@ -15500,7 +15501,6 @@ target_link_libraries(map_pipe_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest upb - absl::flat_hash_set absl::function_ref absl::hash absl::type_traits @@ -16228,7 +16228,6 @@ target_include_directories(mpsc_test target_link_libraries(mpsc_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::flat_hash_set absl::hash absl::type_traits absl::statusor @@ -18848,7 +18847,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(resolve_address_using_ares_resolver_posix_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::flags_parse grpc_test_util ) @@ -18939,7 +18937,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(resolve_address_using_native_resolver_posix_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::flags_parse grpc_test_util ) @@ -23608,7 +23605,6 @@ target_include_directories(test_core_event_engine_slice_buffer_test target_link_libraries(test_core_event_engine_slice_buffer_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest - absl::flat_hash_set absl::hash absl::statusor absl::utility @@ -24236,7 +24232,6 @@ target_link_libraries(test_core_transport_chaotic_good_frame_test ${_gRPC_ZLIB_LIBRARIES} absl::cleanup absl::flat_hash_map - absl::flat_hash_set absl::inlined_vector absl::function_ref absl::hash diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 4afa760d4ba..ca0a519bf74 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -259,11 +259,11 @@ def grpc_deps(): if "com_google_googletest" not in native.existing_rules(): http_archive( name = "com_google_googletest", - sha256 = "c8de6c60e12ad014a28225c5247ee735861d85cf906df617f6a29954ca05f547", - strip_prefix = "googletest-0e402173c97aea7a00749e825b194bfede4f2e45", + sha256 = "31bf78bd91b96dd5e24fab3bb1d7f3f7453ccbaceec9afb86d6e4816a15ab109", + strip_prefix = "googletest-2dd1c131950043a8ad5ab0d2dda0e0970596586a", urls = [ - # 2022-02-09 - "https://github.com/google/googletest/archive/0e402173c97aea7a00749e825b194bfede4f2e45.tar.gz", + # 2023-10-09 + "https://github.com/google/googletest/archive/2dd1c131950043a8ad5ab0d2dda0e0970596586a.tar.gz", ], ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index e03d8ff16c8..1cdc18d4cee 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -2878,9 +2878,15 @@ libs: - third_party/googletest/googletest/src/gtest-typed-test.cc - third_party/googletest/googletest/src/gtest.cc deps: + - re2 + - absl/container:flat_hash_set - absl/debugging:failure_signal_handler - absl/debugging:stacktrace - absl/debugging:symbolize + - absl/flags:flag + - absl/flags:parse + - absl/flags:reflection + - absl/flags:usage - absl/strings:strings - absl/types:any - absl/types:optional @@ -4888,7 +4894,6 @@ targets: - test/core/promise/activity_test.cc deps: - gtest - - absl/container:flat_hash_set - absl/hash:hash - absl/meta:type_traits - absl/status:statusor @@ -6814,7 +6819,6 @@ targets: deps: - gtest - upb - - absl/container:flat_hash_set - absl/functional:function_ref - absl/hash:hash - absl/meta:type_traits @@ -8608,7 +8612,6 @@ targets: deps: - gtest - upb - - absl/container:flat_hash_set - absl/functional:function_ref - absl/hash:hash - absl/meta:type_traits @@ -8725,7 +8728,6 @@ targets: deps: - gtest - upb - - absl/container:flat_hash_set - absl/functional:function_ref - absl/hash:hash - absl/meta:type_traits @@ -10140,7 +10142,6 @@ targets: deps: - gtest - upb - - absl/container:flat_hash_set - absl/functional:function_ref - absl/hash:hash - absl/meta:type_traits @@ -10715,7 +10716,6 @@ targets: deps: - gtest - upb - - absl/container:flat_hash_set - absl/functional:function_ref - absl/hash:hash - absl/meta:type_traits @@ -11112,7 +11112,6 @@ targets: - test/core/promise/mpsc_test.cc deps: - gtest - - absl/container:flat_hash_set - absl/hash:hash - absl/meta:type_traits - absl/status:statusor @@ -12515,7 +12514,6 @@ targets: - test/core/util/tracer_util.cc deps: - gtest - - absl/flags:parse - grpc_test_util args: - --resolver=ares @@ -12589,7 +12587,6 @@ targets: - test/core/util/tracer_util.cc deps: - gtest - - absl/flags:parse - grpc_test_util args: - --resolver=native @@ -15471,7 +15468,6 @@ targets: - test/core/event_engine/slice_buffer_test.cc deps: - gtest - - absl/container:flat_hash_set - absl/hash:hash - absl/status:statusor - absl/utility:utility @@ -16230,7 +16226,6 @@ targets: - z - absl/cleanup:cleanup - absl/container:flat_hash_map - - absl/container:flat_hash_set - absl/container:inlined_vector - absl/functional:function_ref - absl/hash:hash diff --git a/grpc.gyp b/grpc.gyp index 30e9b9bb5d3..b3eb2618ad4 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -1514,9 +1514,15 @@ 'target_name': 'gtest', 'type': 'static_library', 'dependencies': [ + 're2', + 'absl/container:flat_hash_set', 'absl/debugging:failure_signal_handler', 'absl/debugging:stacktrace', 'absl/debugging:symbolize', + 'absl/flags:flag', + 'absl/flags:parse', + 'absl/flags:reflection', + 'absl/flags:usage', 'absl/strings:strings', 'absl/types:any', 'absl/types:optional', diff --git a/third_party/googletest b/third_party/googletest index 0e402173c97..2dd1c131950 160000 --- a/third_party/googletest +++ b/third_party/googletest @@ -1 +1 @@ -Subproject commit 0e402173c97aea7a00749e825b194bfede4f2e45 +Subproject commit 2dd1c131950043a8ad5ab0d2dda0e0970596586a diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 6bfce442543..bf7a862ed49 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -32,7 +32,7 @@ third_party/boringssl-with-bazel 2ff4b968a7e0cfee66d9f151cb95635b43dc1d5b third_party/cares/cares 6360e96b5cf8e5980c887ce58ef727e53d77243a third_party/envoy-api 9d6ffa70677c4dbf23f6ed569676206c4e2edff4 third_party/googleapis 2f9af297c84c55c8b871ba4495e01ade42476c92 -third_party/googletest 0e402173c97aea7a00749e825b194bfede4f2e45 +third_party/googletest 2dd1c131950043a8ad5ab0d2dda0e0970596586a third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89 third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df third_party/protobuf b2b7a51158418f41cff0520894836c15b1738721