diff --git a/CMakeLists.txt b/CMakeLists.txt index 52e7389dcdd..6a71c3c2f57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4624,6 +4624,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(inproc_callback_test + test/core/end2end/fixtures/local_util.cc test/core/end2end/inproc_callback_test.cc ) @@ -4643,7 +4644,7 @@ target_include_directories(inproc_callback_test target_link_libraries(inproc_callback_test ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_tests + grpc_test_util ) @@ -4706,7 +4707,6 @@ endif() if(gRPC_BUILD_TESTS) add_executable(multiple_server_queues_test - test/core/end2end/cq_verifier.cc test/core/end2end/multiple_server_queues_test.cc ) @@ -11484,6 +11484,7 @@ endif() if(gRPC_BUILD_TESTS) add_executable(h2_ssl_session_reuse_test + test/core/end2end/cq_verifier.cc test/core/end2end/h2_ssl_session_reuse_test.cc third_party/googletest/googletest/src/gtest-all.cc third_party/googletest/googlemock/src/gmock-all.cc @@ -11511,7 +11512,7 @@ target_include_directories(h2_ssl_session_reuse_test target_link_libraries(h2_ssl_session_reuse_test ${_gRPC_PROTOBUF_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} - end2end_tests + grpc_test_util ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 77d14206ceb..856023ac826 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -3447,11 +3447,14 @@ targets: - name: inproc_callback_test build: test language: c - headers: [] + headers: + - test/core/end2end/end2end_tests.h + - test/core/end2end/fixtures/local_util.h src: + - test/core/end2end/fixtures/local_util.cc - test/core/end2end/inproc_callback_test.cc deps: - - end2end_tests + - grpc_test_util uses_polling: false - name: invalid_call_argument_test build: test @@ -3475,10 +3478,8 @@ targets: - name: multiple_server_queues_test build: test language: c - headers: - - test/core/end2end/cq_verifier.h + headers: [] src: - - test/core/end2end/cq_verifier.cc - test/core/end2end/multiple_server_queues_test.cc deps: - grpc_test_util @@ -6883,11 +6884,13 @@ targets: gtest: true build: test language: c++ - headers: [] + headers: + - test/core/end2end/cq_verifier.h src: + - test/core/end2end/cq_verifier.cc - test/core/end2end/h2_ssl_session_reuse_test.cc deps: - - end2end_tests + - grpc_test_util - name: handshake_server_with_readahead_handshaker_test gtest: true build: test diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index 2c1a28fca6f..1690d9f7674 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -23,11 +23,20 @@ grpc_cc_library( name = "cq_verifier", srcs = ["cq_verifier.cc"], hdrs = ["cq_verifier.h"], + external_deps = [ + "absl/strings", + "absl/strings:str_format", + "absl/types:variant", + ], language = "C++", visibility = ["//test:__subpackages__"], deps = [ - "//:gpr", + "//:debug_location", + "//:gpr_base", "//:grpc", + "//:grpc_base", + "//:match", + "//:time", "//test/core/util:grpc_test_util", ], ) @@ -49,10 +58,23 @@ grpc_cc_library( name = "http_proxy", srcs = ["fixtures/http_proxy_fixture.cc"], hdrs = ["fixtures/http_proxy_fixture.h"], + external_deps = [ + "absl/status:statusor", + "absl/strings", + ], language = "C++", deps = [ - "//:gpr", + "//:channel_args_preconditioning", + "//:config", + "//:gpr_base", "//:grpc", + "//:grpc_base", + "//:httpcli", + "//:iomgr_fwd", + "//:resolved_address", + "//:slice_refcount", + "//:sockaddr_utils", + "//:time", "//test/core/util:grpc_test_util", ], ) @@ -63,8 +85,11 @@ grpc_cc_library( hdrs = ["fixtures/proxy.h"], language = "C++", deps = [ - "//:gpr", + "//:gpr_base", "//:grpc", + "//:grpc_base", + "//:grpc_codegen", + "//:grpc_public_hdrs", "//test/core/util:grpc_test_util", ], ) @@ -78,10 +103,9 @@ grpc_cc_library( ], language = "C++", deps = [ - "//:gpr", + "//:gpr_base", "//:grpc", - "//:grpc_http_filters", - "//test/core/util:grpc_test_util", + "//:grpc_public_hdrs", ], ) @@ -90,9 +114,12 @@ grpc_cc_test( srcs = ["bad_server_response_test.cc"], language = "C++", deps = [ - ":cq_verifier", - "//:gpr", + "cq_verifier", + "//:gpr_base", "//:grpc", + "//:grpc_base", + "//:grpc_codegen", + "//:grpc_public_hdrs", "//test/core/util:grpc_test_util", ], ) @@ -102,9 +129,12 @@ grpc_cc_test( srcs = ["connection_refused_test.cc"], language = "C++", deps = [ - ":cq_verifier", - "//:gpr", + "cq_verifier", + "//:gpr_base", "//:grpc", + "//:grpc_base", + "//:grpc_codegen", + "//:grpc_public_hdrs", "//test/core/util:grpc_test_util", ], ) @@ -112,12 +142,23 @@ grpc_cc_test( grpc_cc_test( name = "dualstack_socket_test", srcs = ["dualstack_socket_test.cc"], + external_deps = [ + "absl/status:statusor", + "absl/strings", + "absl/strings:str_format", + ], language = "C++", tags = ["no_windows"], deps = [ - ":cq_verifier", - "//:gpr", + "cq_verifier", + "//:gpr_base", "//:grpc", + "//:grpc_base", + "//:grpc_codegen", + "//:grpc_public_hdrs", + "//:iomgr_port", + "//:resolved_address", + "//:sockaddr_utils", "//test/core/util:grpc_test_util", ], ) @@ -125,11 +166,28 @@ grpc_cc_test( grpc_cc_test( name = "goaway_server_test", srcs = ["goaway_server_test.cc"], + external_deps = [ + "absl/memory", + "absl/status", + "absl/status:statusor", + "absl/strings", + ], language = "C++", deps = [ - ":cq_verifier", - "//:gpr", + "cq_verifier", + "//:debug_location", + "//:default_event_engine_factory_hdrs", + "//:gpr_base", "//:grpc", + "//:grpc_base", + "//:grpc_codegen", + "//:grpc_public_hdrs", + "//:grpc_resolver_dns_ares", + "//:grpc_sockaddr", + "//:iomgr_fwd", + "//:resolved_address", + "//:server_address", + "//:time", "//test/core/util:grpc_test_util", ], ) @@ -141,9 +199,12 @@ grpc_cc_test( uses_event_engine = False, uses_polling = False, deps = [ - ":end2end_tests", - "//:gpr", + "local_util", + "//:gpr_base", "//:grpc", + "//:grpc_codegen", + "//:grpc_public_hdrs", + "//:grpc_transport_inproc", "//test/core/util:grpc_test_util", ], ) @@ -151,11 +212,15 @@ grpc_cc_test( grpc_cc_test( name = "invalid_call_argument_test", srcs = ["invalid_call_argument_test.cc"], + external_deps = ["absl/memory"], language = "C++", deps = [ - ":cq_verifier", - "//:gpr", + "cq_verifier", + "//:gpr_base", + "//:gpr_platform", "//:grpc", + "//:grpc_codegen", + "//:grpc_public_hdrs", "//test/core/util:grpc_test_util", ], ) @@ -165,8 +230,7 @@ grpc_cc_test( srcs = ["multiple_server_queues_test.cc"], language = "C++", deps = [ - ":cq_verifier", - "//:gpr", + "//:gpr_base", "//:grpc", "//test/core/util:grpc_test_util", ], @@ -177,9 +241,14 @@ grpc_cc_test( srcs = ["no_server_test.cc"], language = "C++", deps = [ - ":cq_verifier", - "//:gpr", + "cq_verifier", + "//:exec_ctx", + "//:gpr_base", "//:grpc", + "//:grpc_codegen", + "//:grpc_public_hdrs", + "//:grpc_resolver_fake", + "//:ref_counted_ptr", "//test/core/util:grpc_test_util", ], ) @@ -196,14 +265,17 @@ grpc_cc_test( "//src/core/tsi/test_creds:server1.key", "//src/core/tsi/test_creds:server1.pem", ], - external_deps = [ - "gtest", - ], + external_deps = ["gtest"], language = "C++", deps = [ - ":end2end_tests", - "//:gpr", + "cq_verifier", + "//:gpr_base", "//:grpc", + "//:grpc_base", + "//:grpc_codegen", + "//:grpc_public_hdrs", + "//:tsi_ssl_credentials", + "//:useful", "//test/core/util:grpc_test_util", ], ) diff --git a/tools/distrib/fix_build_deps.py b/tools/distrib/fix_build_deps.py index 0e6e8843f86..723441c7199 100755 --- a/tools/distrib/fix_build_deps.py +++ b/tools/distrib/fix_build_deps.py @@ -373,7 +373,8 @@ parser.add_argument('--whats_left', args = parser.parse_args() for dirname in [ - "", "test/core/uri", "test/core/util", "test/core/event_engine" + "", "test/core/uri", "test/core/util", "test/core/end2end", + "test/core/event_engine" ]: parsing_path = dirname exec( @@ -389,6 +390,7 @@ for dirname in [ 'grpc_cc_test': grpc_cc_library, 'grpc_fuzzer': grpc_cc_library, 'select': lambda d: d["//conditions:default"], + 'grpc_end2end_tests': lambda: None, 'grpc_upb_proto_library': lambda name, **kwargs: None, 'grpc_upb_proto_reflection_library': lambda name, **kwargs: None, 'grpc_generate_one_off_targets': lambda: None,