From 5b49a1b4bd4ba736079faadbb7bc34936855e0b2 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 20 Jul 2022 18:58:25 -0700 Subject: [PATCH] gtestify test/core/iomgr (#30209) * gtestify test/core/iomgr --- CMakeLists.txt | 1118 +++++++++-------- build_autogenerated.yaml | 351 +++--- test/core/iomgr/BUILD | 19 + test/core/iomgr/buffer_list_test.cc | 50 +- test/core/iomgr/combiner_test.cc | 36 +- test/core/iomgr/endpoint_pair_test.cc | 11 +- test/core/iomgr/fd_conservation_posix_test.cc | 14 +- test/core/iomgr/fd_posix_test.cc | 71 +- .../grpc_ipv6_loopback_available_test.cc | 17 +- test/core/iomgr/load_file_test.cc | 73 +- test/core/iomgr/resolve_address_posix_test.cc | 46 +- test/core/iomgr/socket_utils_test.cc | 57 +- test/core/iomgr/tcp_client_posix_test.cc | 70 +- test/core/iomgr/tcp_posix_test.cc | 100 +- test/core/iomgr/tcp_server_posix_test.cc | 112 +- test/core/iomgr/timer_heap_test.cc | 65 +- test/core/iomgr/timer_list_test.cc | 68 +- tools/run_tests/generated/tests.json | 718 +++++------ 18 files changed, 1593 insertions(+), 1403 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cad96a12f9..9ae7bf1cf1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -783,21 +783,10 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_c bad_ssl_cert_test) endif() - add_dependencies(buildtests_c buffer_list_test) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_c combiner_test) - endif() add_dependencies(buildtests_c connection_refused_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_c dualstack_socket_test) endif() - add_dependencies(buildtests_c endpoint_pair_test) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_c fd_conservation_posix_test) - endif() - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_c fd_posix_test) - endif() if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_c fling_stream_test) endif() @@ -805,34 +794,12 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_c fling_test) endif() add_dependencies(buildtests_c goaway_server_test) - add_dependencies(buildtests_c grpc_ipv6_loopback_available_test) add_dependencies(buildtests_c inproc_callback_test) add_dependencies(buildtests_c invalid_call_argument_test) - add_dependencies(buildtests_c load_file_test) add_dependencies(buildtests_c minimal_stack_is_minimal_test) add_dependencies(buildtests_c multiple_server_queues_test) add_dependencies(buildtests_c no_server_test) add_dependencies(buildtests_c public_headers_must_be_c89) - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_c resolve_address_using_ares_resolver_posix_test) - endif() - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_c resolve_address_using_native_resolver_posix_test) - endif() - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_c socket_utils_test) - endif() - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_c tcp_client_posix_test) - endif() - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_c tcp_posix_test) - endif() - if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - add_dependencies(buildtests_c tcp_server_posix_test) - endif() - add_dependencies(buildtests_c test_core_iomgr_timer_heap_test) - add_dependencies(buildtests_c test_core_iomgr_timer_list_test) add_custom_target(buildtests_cxx) add_dependencies(buildtests_cxx activity_test) @@ -885,6 +852,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx binder_server_test) add_dependencies(buildtests_cxx binder_transport_test) add_dependencies(buildtests_cxx bitset_test) + add_dependencies(buildtests_cxx buffer_list_test) add_dependencies(buildtests_cxx byte_buffer_test) add_dependencies(buildtests_cxx c_slice_buffer_test) add_dependencies(buildtests_cxx call_finalization_test) @@ -925,6 +893,9 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx cmdline_test) add_dependencies(buildtests_cxx codegen_test_full) add_dependencies(buildtests_cxx codegen_test_minimal) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx combiner_test) + endif() add_dependencies(buildtests_cxx completion_queue_threading_test) add_dependencies(buildtests_cxx compression_test) add_dependencies(buildtests_cxx concurrent_connectivity_test) @@ -949,6 +920,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx end2end_test) add_dependencies(buildtests_cxx endpoint_binder_pool_test) add_dependencies(buildtests_cxx endpoint_config_test) + add_dependencies(buildtests_cxx endpoint_pair_test) add_dependencies(buildtests_cxx env_test) add_dependencies(buildtests_cxx error_details_test) add_dependencies(buildtests_cxx error_test) @@ -965,6 +937,12 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx fake_binder_test) add_dependencies(buildtests_cxx fake_resolver_test) add_dependencies(buildtests_cxx fake_transport_security_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx fd_conservation_posix_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx fd_posix_test) + endif() add_dependencies(buildtests_cxx file_watcher_certificate_provider_factory_test) add_dependencies(buildtests_cxx filter_end2end_test) add_dependencies(buildtests_cxx flaky_network_test) @@ -993,6 +971,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx grpc_byte_buffer_reader_test) add_dependencies(buildtests_cxx grpc_cli) add_dependencies(buildtests_cxx grpc_completion_queue_test) + add_dependencies(buildtests_cxx grpc_ipv6_loopback_available_test) add_dependencies(buildtests_cxx grpc_tls_certificate_distributor_test) add_dependencies(buildtests_cxx grpc_tls_certificate_provider_test) add_dependencies(buildtests_cxx grpc_tls_certificate_verifier_test) @@ -1044,6 +1023,7 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx latch_test) add_dependencies(buildtests_cxx lb_get_cpu_stats_test) add_dependencies(buildtests_cxx lb_load_data_store_test) + add_dependencies(buildtests_cxx load_file_test) add_dependencies(buildtests_cxx lock_free_event_test) add_dependencies(buildtests_cxx log_test) add_dependencies(buildtests_cxx loop_test) @@ -1101,7 +1081,13 @@ if(gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) add_dependencies(buildtests_cxx remove_stream_from_stalled_lists_test) endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx resolve_address_using_ares_resolver_posix_test) + endif() add_dependencies(buildtests_cxx resolve_address_using_ares_resolver_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx resolve_address_using_native_resolver_posix_test) + endif() add_dependencies(buildtests_cxx resolve_address_using_native_resolver_test) add_dependencies(buildtests_cxx resource_quota_test) add_dependencies(buildtests_cxx retry_throttle_test) @@ -1144,6 +1130,9 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx smoke_test) add_dependencies(buildtests_cxx sockaddr_resolver_test) add_dependencies(buildtests_cxx sockaddr_utils_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx socket_utils_test) + endif() add_dependencies(buildtests_cxx spinlock_test) add_dependencies(buildtests_cxx ssl_credentials_test) if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) @@ -1170,11 +1159,22 @@ if(gRPC_BUILD_TESTS) add_dependencies(buildtests_cxx sync_test) add_dependencies(buildtests_cxx system_roots_test) add_dependencies(buildtests_cxx table_test) + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx tcp_client_posix_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx tcp_posix_test) + endif() + if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + add_dependencies(buildtests_cxx tcp_server_posix_test) + endif() add_dependencies(buildtests_cxx test_core_event_engine_iomgr_event_engine_timer_heap_test) add_dependencies(buildtests_cxx test_core_event_engine_iomgr_event_engine_timer_list_test) add_dependencies(buildtests_cxx test_core_event_engine_slice_buffer_test) add_dependencies(buildtests_cxx test_core_gpr_time_test) add_dependencies(buildtests_cxx test_core_gprpp_time_test) + add_dependencies(buildtests_cxx test_core_iomgr_timer_heap_test) + add_dependencies(buildtests_cxx test_core_iomgr_timer_list_test) add_dependencies(buildtests_cxx test_core_security_credentials_test) add_dependencies(buildtests_cxx test_core_slice_slice_buffer_test) add_dependencies(buildtests_cxx test_core_slice_slice_test) @@ -4378,62 +4378,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ) -endif() -endif() -if(gRPC_BUILD_TESTS) - -add_executable(buffer_list_test - test/core/iomgr/buffer_list_test.cc -) - -target_include_directories(buffer_list_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(buffer_list_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - -endif() -if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - - add_executable(combiner_test - test/core/iomgr/combiner_test.cc - ) - - target_include_directories(combiner_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - ) - - target_link_libraries(combiner_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - ) - - endif() endif() if(gRPC_BUILD_TESTS) @@ -4492,92 +4436,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) ) -endif() -endif() -if(gRPC_BUILD_TESTS) - -add_executable(endpoint_pair_test - test/core/iomgr/endpoint_pair_test.cc - test/core/iomgr/endpoint_tests.cc -) - -target_include_directories(endpoint_pair_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(endpoint_pair_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - -endif() -if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - - add_executable(fd_conservation_posix_test - test/core/iomgr/fd_conservation_posix_test.cc - ) - - target_include_directories(fd_conservation_posix_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - ) - - target_link_libraries(fd_conservation_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - ) - - -endif() -endif() -if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - - add_executable(fd_posix_test - test/core/iomgr/fd_posix_test.cc - ) - - target_include_directories(fd_posix_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - ) - - target_link_libraries(fd_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - ) - - endif() endif() if(gRPC_BUILD_TESTS) @@ -4673,33 +4531,6 @@ target_link_libraries(goaway_server_test ) -endif() -if(gRPC_BUILD_TESTS) - -add_executable(grpc_ipv6_loopback_available_test - test/core/iomgr/grpc_ipv6_loopback_available_test.cc -) - -target_include_directories(grpc_ipv6_loopback_available_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(grpc_ipv6_loopback_available_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - endif() if(gRPC_BUILD_TESTS) @@ -4755,33 +4586,6 @@ target_link_libraries(invalid_call_argument_test ) -endif() -if(gRPC_BUILD_TESTS) - -add_executable(load_file_test - test/core/iomgr/load_file_test.cc -) - -target_include_directories(load_file_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(load_file_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - endif() if(gRPC_BUILD_TESTS) @@ -4894,235 +4698,6 @@ target_link_libraries(public_headers_must_be_c89 ) -endif() -if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - - add_executable(resolve_address_using_ares_resolver_posix_test - test/core/iomgr/resolve_address_posix_test.cc - ) - - target_include_directories(resolve_address_using_ares_resolver_posix_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - ) - - target_link_libraries(resolve_address_using_ares_resolver_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - ) - - -endif() -endif() -if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - - add_executable(resolve_address_using_native_resolver_posix_test - test/core/iomgr/resolve_address_posix_test.cc - ) - - target_include_directories(resolve_address_using_native_resolver_posix_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - ) - - target_link_libraries(resolve_address_using_native_resolver_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - ) - - -endif() -endif() -if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - - add_executable(socket_utils_test - test/core/iomgr/socket_utils_test.cc - ) - - target_include_directories(socket_utils_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - ) - - target_link_libraries(socket_utils_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - ) - - -endif() -endif() -if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - - add_executable(tcp_client_posix_test - test/core/iomgr/tcp_client_posix_test.cc - ) - - target_include_directories(tcp_client_posix_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - ) - - target_link_libraries(tcp_client_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - ) - - -endif() -endif() -if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) - - add_executable(tcp_posix_test - test/core/iomgr/endpoint_tests.cc - test/core/iomgr/tcp_posix_test.cc - ) - - target_include_directories(tcp_posix_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - ) - - target_link_libraries(tcp_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - ) - - -endif() -endif() -if(gRPC_BUILD_TESTS) -if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) - - add_executable(tcp_server_posix_test - test/core/iomgr/tcp_server_posix_test.cc - ) - - target_include_directories(tcp_server_posix_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - ) - - target_link_libraries(tcp_server_posix_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util - ) - - -endif() -endif() -if(gRPC_BUILD_TESTS) - -add_executable(test_core_iomgr_timer_heap_test - test/core/iomgr/timer_heap_test.cc -) - -target_include_directories(test_core_iomgr_timer_heap_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(test_core_iomgr_timer_heap_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - -endif() -if(gRPC_BUILD_TESTS) - -add_executable(test_core_iomgr_timer_list_test - test/core/iomgr/timer_list_test.cc -) - -target_include_directories(test_core_iomgr_timer_list_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} -) - -target_link_libraries(test_core_iomgr_timer_list_test - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util -) - - endif() if(gRPC_BUILD_TESTS) @@ -6781,6 +6356,41 @@ target_link_libraries(bitset_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(buffer_list_test + test/core/iomgr/buffer_list_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(buffer_list_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(buffer_list_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) @@ -8180,18 +7790,55 @@ target_link_libraries(codegen_test_minimal endif() if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(completion_queue_threading_test - test/core/surface/completion_queue_threading_test.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) + add_executable(combiner_test + test/core/iomgr/combiner_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_include_directories(completion_queue_threading_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + target_include_directories(combiner_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(combiner_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + ) + + +endif() +endif() +if(gRPC_BUILD_TESTS) + +add_executable(completion_queue_threading_test + test/core/surface/completion_queue_threading_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(completion_queue_threading_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} ${_gRPC_RE2_INCLUDE_DIR} ${_gRPC_SSL_INCLUDE_DIR} ${_gRPC_UPB_GENERATED_DIR} @@ -9088,6 +8735,42 @@ target_link_libraries(endpoint_config_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(endpoint_pair_test + test/core/iomgr/endpoint_pair_test.cc + test/core/iomgr/endpoint_tests.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(endpoint_pair_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(endpoint_pair_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) @@ -9627,6 +9310,80 @@ target_link_libraries(fake_transport_security_test ) +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + + add_executable(fd_conservation_posix_test + test/core/iomgr/fd_conservation_posix_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(fd_conservation_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(fd_conservation_posix_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + ) + + +endif() +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + + add_executable(fd_posix_test + test/core/iomgr/fd_posix_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(fd_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(fd_posix_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + ) + + +endif() endif() if(gRPC_BUILD_TESTS) @@ -10649,6 +10406,41 @@ if(gRPC_INSTALL) ) endif() +endif() +if(gRPC_BUILD_TESTS) + +add_executable(grpc_ipv6_loopback_available_test + test/core/iomgr/grpc_ipv6_loopback_available_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(grpc_ipv6_loopback_available_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(grpc_ipv6_loopback_available_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + endif() if(gRPC_BUILD_CODEGEN AND gRPC_BUILD_GRPC_NODE_PLUGIN) @@ -12532,6 +12324,41 @@ target_link_libraries(lb_load_data_store_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(load_file_test + test/core/iomgr/load_file_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(load_file_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(load_file_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) @@ -14595,41 +14422,119 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) endif() endif() if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) -add_executable(resolve_address_using_ares_resolver_test - test/core/iomgr/resolve_address_test.cc - test/core/util/fake_udp_and_tcp_server.cc - third_party/googletest/googletest/src/gtest-all.cc - third_party/googletest/googlemock/src/gmock-all.cc -) - -target_include_directories(resolve_address_using_ares_resolver_test - PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} - ${_gRPC_RE2_INCLUDE_DIR} - ${_gRPC_SSL_INCLUDE_DIR} - ${_gRPC_UPB_GENERATED_DIR} - ${_gRPC_UPB_GRPC_GENERATED_DIR} - ${_gRPC_UPB_INCLUDE_DIR} - ${_gRPC_XXHASH_INCLUDE_DIR} - ${_gRPC_ZLIB_INCLUDE_DIR} - third_party/googletest/googletest/include - third_party/googletest/googletest - third_party/googletest/googlemock/include - third_party/googletest/googlemock - ${_gRPC_PROTO_GENS_DIR} -) + add_executable(resolve_address_using_ares_resolver_posix_test + test/core/iomgr/resolve_address_posix_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) -target_link_libraries(resolve_address_using_ares_resolver_test - ${_gRPC_PROTOBUF_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - grpc_test_util + target_include_directories(resolve_address_using_ares_resolver_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(resolve_address_using_ares_resolver_posix_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + absl::flags + absl::flags_parse + grpc_test_util + ) + + +endif() +endif() +if(gRPC_BUILD_TESTS) + +add_executable(resolve_address_using_ares_resolver_test + test/core/iomgr/resolve_address_test.cc + test/core/util/fake_udp_and_tcp_server.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(resolve_address_using_ares_resolver_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(resolve_address_using_ares_resolver_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util grpc++_test_config ) +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + + add_executable(resolve_address_using_native_resolver_posix_test + test/core/iomgr/resolve_address_posix_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(resolve_address_using_native_resolver_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(resolve_address_using_native_resolver_posix_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + absl::flags + absl::flags_parse + grpc_test_util + ) + + +endif() endif() if(gRPC_BUILD_TESTS) @@ -16097,6 +16002,43 @@ target_link_libraries(sockaddr_utils_test ) +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + + add_executable(socket_utils_test + test/core/iomgr/socket_utils_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(socket_utils_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(socket_utils_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + ) + + +endif() endif() if(gRPC_BUILD_TESTS) @@ -16763,6 +16705,118 @@ target_link_libraries(table_test ) +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + + add_executable(tcp_client_posix_test + test/core/iomgr/tcp_client_posix_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(tcp_client_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(tcp_client_posix_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + ) + + +endif() +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX) + + add_executable(tcp_posix_test + test/core/iomgr/endpoint_tests.cc + test/core/iomgr/tcp_posix_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(tcp_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(tcp_posix_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + ) + + +endif() +endif() +if(gRPC_BUILD_TESTS) +if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) + + add_executable(tcp_server_posix_test + test/core/iomgr/tcp_server_posix_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc + ) + + target_include_directories(tcp_server_posix_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} + ) + + target_link_libraries(tcp_server_posix_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util + ) + + +endif() endif() if(gRPC_BUILD_TESTS) @@ -17115,6 +17169,76 @@ target_link_libraries(test_core_gprpp_time_test ) +endif() +if(gRPC_BUILD_TESTS) + +add_executable(test_core_iomgr_timer_heap_test + test/core/iomgr/timer_heap_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(test_core_iomgr_timer_heap_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(test_core_iomgr_timer_heap_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + +endif() +if(gRPC_BUILD_TESTS) + +add_executable(test_core_iomgr_timer_list_test + test/core/iomgr/timer_list_test.cc + third_party/googletest/googletest/src/gtest-all.cc + third_party/googletest/googlemock/src/gmock-all.cc +) + +target_include_directories(test_core_iomgr_timer_list_test + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} + ${_gRPC_RE2_INCLUDE_DIR} + ${_gRPC_SSL_INCLUDE_DIR} + ${_gRPC_UPB_GENERATED_DIR} + ${_gRPC_UPB_GRPC_GENERATED_DIR} + ${_gRPC_UPB_INCLUDE_DIR} + ${_gRPC_XXHASH_INCLUDE_DIR} + ${_gRPC_ZLIB_INCLUDE_DIR} + third_party/googletest/googletest/include + third_party/googletest/googletest + third_party/googletest/googlemock/include + third_party/googletest/googlemock + ${_gRPC_PROTO_GENS_DIR} +) + +target_link_libraries(test_core_iomgr_timer_list_test + ${_gRPC_PROTOBUF_LIBRARIES} + ${_gRPC_ALLTARGETS_LIBRARIES} + grpc_test_util +) + + endif() if(gRPC_BUILD_TESTS) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index d01e0c9c251..354cfa58ba3 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -3239,26 +3239,6 @@ targets: - linux - posix - mac -- name: buffer_list_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/buffer_list_test.cc - deps: - - grpc_test_util -- name: combiner_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/combiner_test.cc - deps: - - grpc_test_util - platforms: - - linux - - posix - - mac - name: connection_refused_test build: test language: c @@ -3283,40 +3263,6 @@ targets: - linux - posix - mac -- name: endpoint_pair_test - build: test - language: c - headers: - - test/core/iomgr/endpoint_tests.h - src: - - test/core/iomgr/endpoint_pair_test.cc - - test/core/iomgr/endpoint_tests.cc - deps: - - grpc_test_util -- name: fd_conservation_posix_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/fd_conservation_posix_test.cc - deps: - - grpc_test_util - platforms: - - linux - - posix - - mac -- name: fd_posix_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/fd_posix_test.cc - deps: - - grpc_test_util - platforms: - - linux - - posix - - mac - name: fling_stream_test build: test language: c @@ -3361,14 +3307,6 @@ targets: - test/core/end2end/goaway_server_test.cc deps: - grpc_test_util -- name: grpc_ipv6_loopback_available_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/grpc_ipv6_loopback_available_test.cc - deps: - - grpc_test_util - name: inproc_callback_test build: test language: c @@ -3388,15 +3326,6 @@ targets: - test/core/end2end/invalid_call_argument_test.cc deps: - grpc_test_util -- name: load_file_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/load_file_test.cc - deps: - - grpc_test_util - uses_polling: false - name: minimal_stack_is_minimal_test build: test language: c @@ -3438,101 +3367,6 @@ targets: - test/core/surface/public_headers_must_be_c89.c deps: - grpc_test_util -- name: resolve_address_using_ares_resolver_posix_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/resolve_address_posix_test.cc - deps: - - grpc_test_util - args: - - --resolver=ares - platforms: - - linux - - posix - - mac -- name: resolve_address_using_native_resolver_posix_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/resolve_address_posix_test.cc - deps: - - grpc_test_util - args: - - --resolver=native - platforms: - - linux - - posix - - mac -- name: socket_utils_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/socket_utils_test.cc - deps: - - grpc_test_util - platforms: - - linux - - posix - - mac -- name: tcp_client_posix_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/tcp_client_posix_test.cc - deps: - - grpc_test_util - platforms: - - linux - - posix - - mac -- name: tcp_posix_test - build: test - language: c - headers: - - test/core/iomgr/endpoint_tests.h - src: - - test/core/iomgr/endpoint_tests.cc - - test/core/iomgr/tcp_posix_test.cc - deps: - - grpc_test_util - platforms: - - linux - - posix -- name: tcp_server_posix_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/tcp_server_posix_test.cc - deps: - - grpc_test_util - platforms: - - linux - - posix - - mac -- name: test_core_iomgr_timer_heap_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/timer_heap_test.cc - deps: - - grpc_test_util - uses_polling: false -- name: test_core_iomgr_timer_list_test - build: test - language: c - headers: [] - src: - - test/core/iomgr/timer_list_test.cc - deps: - - grpc_test_util - uses_polling: false - name: activity_test gtest: true build: test @@ -4274,6 +4108,15 @@ targets: - absl/strings:strings - absl/types:variant uses_polling: false +- name: buffer_list_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/buffer_list_test.cc + deps: + - grpc_test_util - name: byte_buffer_test gtest: true build: test @@ -4789,6 +4632,19 @@ targets: - grpc++ - grpc_test_util uses_polling: false +- name: combiner_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/combiner_test.cc + deps: + - grpc_test_util + platforms: + - linux + - posix + - mac - name: completion_queue_threading_test gtest: true build: test @@ -5132,6 +4988,17 @@ targets: deps: - grpc_test_util uses_polling: false +- name: endpoint_pair_test + gtest: true + build: test + language: c++ + headers: + - test/core/iomgr/endpoint_tests.h + src: + - test/core/iomgr/endpoint_pair_test.cc + - test/core/iomgr/endpoint_tests.cc + deps: + - grpc_test_util - name: env_test gtest: true build: test @@ -5415,6 +5282,32 @@ targets: - test/core/tsi/transport_security_test_lib.cc deps: - grpc_test_util +- name: fd_conservation_posix_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/fd_conservation_posix_test.cc + deps: + - grpc_test_util + platforms: + - linux + - posix + - mac +- name: fd_posix_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/fd_posix_test.cc + deps: + - grpc_test_util + platforms: + - linux + - posix + - mac - name: file_watcher_certificate_provider_factory_test gtest: true build: test @@ -5869,6 +5762,15 @@ targets: - src/compiler/csharp_plugin.cc deps: - grpc_plugin_support +- name: grpc_ipv6_loopback_available_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/grpc_ipv6_loopback_available_test.cc + deps: + - grpc_test_util - name: grpc_node_plugin build: protoc language: c++ @@ -6549,6 +6451,16 @@ targets: deps: - grpc++ - grpc_test_util +- name: load_file_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/load_file_test.cc + deps: + - grpc_test_util + uses_polling: false - name: lock_free_event_test gtest: true build: test @@ -7528,6 +7440,23 @@ targets: - linux - posix - mac +- name: resolve_address_using_ares_resolver_posix_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/resolve_address_posix_test.cc + deps: + - absl/flags:flag + - absl/flags:parse + - grpc_test_util + args: + - --resolver=ares + platforms: + - linux + - posix + - mac - name: resolve_address_using_ares_resolver_test gtest: true build: test @@ -7540,6 +7469,23 @@ targets: deps: - grpc_test_util - grpc++_test_config +- name: resolve_address_using_native_resolver_posix_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/resolve_address_posix_test.cc + deps: + - absl/flags:flag + - absl/flags:parse + - grpc_test_util + args: + - --resolver=native + platforms: + - linux + - posix + - mac - name: resolve_address_using_native_resolver_test gtest: true build: test @@ -8114,6 +8060,19 @@ targets: - test/core/address_utils/sockaddr_utils_test.cc deps: - grpc_test_util +- name: socket_utils_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/socket_utils_test.cc + deps: + - grpc_test_util + platforms: + - linux + - posix + - mac - name: spinlock_test gtest: true build: test @@ -8322,6 +8281,46 @@ targets: - absl/types:variant - absl/utility:utility uses_polling: false +- name: tcp_client_posix_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/tcp_client_posix_test.cc + deps: + - grpc_test_util + platforms: + - linux + - posix + - mac +- name: tcp_posix_test + gtest: true + build: test + language: c++ + headers: + - test/core/iomgr/endpoint_tests.h + src: + - test/core/iomgr/endpoint_tests.cc + - test/core/iomgr/tcp_posix_test.cc + deps: + - grpc_test_util + platforms: + - linux + - posix +- name: tcp_server_posix_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/tcp_server_posix_test.cc + deps: + - grpc_test_util + platforms: + - linux + - posix + - mac - name: test_core_event_engine_iomgr_event_engine_timer_heap_test gtest: true build: test @@ -8639,6 +8638,26 @@ targets: - absl/types:optional - absl/types:variant uses_polling: false +- name: test_core_iomgr_timer_heap_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/timer_heap_test.cc + deps: + - grpc_test_util + uses_polling: false +- name: test_core_iomgr_timer_list_test + gtest: true + build: test + language: c++ + headers: [] + src: + - test/core/iomgr/timer_list_test.cc + deps: + - grpc_test_util + uses_polling: false - name: test_core_security_credentials_test gtest: true build: test diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index e9f8ac620f1..ad04f6120ba 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -42,6 +42,7 @@ grpc_cc_test( name = "combiner_test", srcs = ["combiner_test.cc"], exec_properties = LARGE_MACHINE, + external_deps = ["gtest"], language = "C++", tags = ["no_windows"], # LARGE_MACHINE is not configured for windows RBE deps = [ @@ -54,6 +55,7 @@ grpc_cc_test( grpc_cc_test( name = "endpoint_pair_test", srcs = ["endpoint_pair_test.cc"], + external_deps = ["gtest"], language = "C++", deps = [ ":endpoint_tests", @@ -83,6 +85,7 @@ grpc_cc_test( grpc_cc_test( name = "fd_conservation_posix_test", srcs = ["fd_conservation_posix_test.cc"], + external_deps = ["gtest"], language = "C++", tags = ["no_windows"], deps = [ @@ -95,6 +98,7 @@ grpc_cc_test( grpc_cc_test( name = "fd_posix_test", srcs = ["fd_posix_test.cc"], + external_deps = ["gtest"], language = "C++", tags = ["no_windows"], deps = [ @@ -107,6 +111,7 @@ grpc_cc_test( grpc_cc_test( name = "grpc_ipv6_loopback_available_test", srcs = ["grpc_ipv6_loopback_available_test.cc"], + external_deps = ["gtest"], language = "C++", deps = [ "//:gpr", @@ -118,6 +123,7 @@ grpc_cc_test( grpc_cc_test( name = "load_file_test", srcs = ["load_file_test.cc"], + external_deps = ["gtest"], language = "C++", uses_event_engine = False, uses_polling = False, @@ -135,7 +141,10 @@ grpc_cc_test( "--resolver=ares", ], external_deps = [ + "absl/flags:flag", + "absl/flags:parse", "absl/strings", + "gtest", ], language = "C++", tags = ["no_windows"], @@ -153,7 +162,10 @@ grpc_cc_test( "--resolver=native", ], external_deps = [ + "absl/flags:flag", + "absl/flags:parse", "absl/strings", + "gtest", ], language = "C++", tags = ["no_windows"], @@ -201,6 +213,7 @@ grpc_cc_test( grpc_cc_test( name = "socket_utils_test", srcs = ["socket_utils_test.cc"], + external_deps = ["gtest"], language = "C++", tags = ["no_windows"], deps = [ @@ -213,6 +226,7 @@ grpc_cc_test( grpc_cc_test( name = "tcp_client_posix_test", srcs = ["tcp_client_posix_test.cc"], + external_deps = ["gtest"], language = "C++", tags = ["no_windows"], deps = [ @@ -225,6 +239,7 @@ grpc_cc_test( grpc_cc_test( name = "tcp_posix_test", srcs = ["tcp_posix_test.cc"], + external_deps = ["gtest"], language = "C++", tags = [ "no_mac", # TODO(jtattermusch): Reenable once https://github.com/grpc/grpc/issues/21282 is fixed. @@ -241,6 +256,7 @@ grpc_cc_test( grpc_cc_test( name = "buffer_list_test", srcs = ["buffer_list_test.cc"], + external_deps = ["gtest"], language = "C++", deps = [ "//:gpr", @@ -252,6 +268,7 @@ grpc_cc_test( grpc_cc_test( name = "tcp_server_posix_test", srcs = ["tcp_server_posix_test.cc"], + external_deps = ["gtest"], language = "C++", tags = ["no_windows"], deps = [ @@ -264,6 +281,7 @@ grpc_cc_test( grpc_cc_test( name = "timer_heap_test", srcs = ["timer_heap_test.cc"], + external_deps = ["gtest"], language = "C++", uses_event_engine = False, uses_polling = False, @@ -277,6 +295,7 @@ grpc_cc_test( grpc_cc_test( name = "timer_list_test", srcs = ["timer_list_test.cc"], + external_deps = ["gtest"], language = "C++", uses_event_engine = False, uses_polling = False, diff --git a/test/core/iomgr/buffer_list_test.cc b/test/core/iomgr/buffer_list_test.cc index 5be883c4078..ae06ebe5c3a 100644 --- a/test/core/iomgr/buffer_list_test.cc +++ b/test/core/iomgr/buffer_list_test.cc @@ -18,6 +18,8 @@ #include "src/core/lib/iomgr/buffer_list.h" +#include + #include #include "src/core/lib/iomgr/port.h" @@ -28,8 +30,8 @@ static void TestShutdownFlushesListVerifier(void* arg, grpc_core::Timestamps* /*ts*/, grpc_error_handle error) { - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); - GPR_ASSERT(arg != nullptr); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); + ASSERT_NE(arg, nullptr); gpr_atm* done = reinterpret_cast(arg); gpr_atm_rel_store(done, static_cast(1)); } @@ -38,7 +40,7 @@ static void TestShutdownFlushesListVerifier(void* arg, * shutdown. * Also tests that arg is passed correctly. */ -static void TestShutdownFlushesList() { +TEST(BufferListTest, Testshutdownflusheslist) { grpc_core::grpc_tcp_set_write_timestamps_callback( TestShutdownFlushesListVerifier); grpc_core::TracedBuffer* list = nullptr; @@ -50,29 +52,28 @@ static void TestShutdownFlushesList() { &list, i, 0, static_cast(&verifier_called[i])); } grpc_core::TracedBuffer::Shutdown(&list, nullptr, GRPC_ERROR_NONE); - GPR_ASSERT(list == nullptr); + ASSERT_EQ(list, nullptr); for (auto i = 0; i < NUM_ELEM; i++) { - GPR_ASSERT(gpr_atm_acq_load(&verifier_called[i]) == - static_cast(1)); + ASSERT_EQ(gpr_atm_acq_load(&verifier_called[i]), static_cast(1)); } } static void TestVerifierCalledOnAckVerifier(void* arg, grpc_core::Timestamps* ts, grpc_error_handle error) { - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); - GPR_ASSERT(arg != nullptr); - GPR_ASSERT(ts->acked_time.time.clock_type == GPR_CLOCK_REALTIME); - GPR_ASSERT(ts->acked_time.time.tv_sec == 123); - GPR_ASSERT(ts->acked_time.time.tv_nsec == 456); - GPR_ASSERT(ts->info.length > 0); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); + ASSERT_NE(arg, nullptr); + ASSERT_EQ(ts->acked_time.time.clock_type, GPR_CLOCK_REALTIME); + ASSERT_EQ(ts->acked_time.time.tv_sec, 123); + ASSERT_EQ(ts->acked_time.time.tv_nsec, 456); + ASSERT_GT(ts->info.length, 0); gpr_atm* done = reinterpret_cast(arg); gpr_atm_rel_store(done, static_cast(1)); } /** Tests that the timestamp verifier is called on an ACK timestamp. */ -static void TestVerifierCalledOnAck() { +TEST(BufferListTest, Testverifiercalledonack) { struct sock_extended_err serr; serr.ee_data = 213; serr.ee_info = grpc_core::SCM_TSTAMP_ACK; @@ -86,14 +87,14 @@ static void TestVerifierCalledOnAck() { gpr_atm_rel_store(&verifier_called, static_cast(0)); grpc_core::TracedBuffer::AddNewEntry(&list, 213, 0, &verifier_called); grpc_core::TracedBuffer::ProcessTimestamp(&list, &serr, nullptr, &tss); - GPR_ASSERT(gpr_atm_acq_load(&verifier_called) == static_cast(1)); - GPR_ASSERT(list == nullptr); + ASSERT_EQ(gpr_atm_acq_load(&verifier_called), static_cast(1)); + ASSERT_EQ(list, nullptr); grpc_core::TracedBuffer::Shutdown(&list, nullptr, GRPC_ERROR_NONE); } /** Tests that shutdown can be called repeatedly. */ -static void TestRepeatedShutdown() { +TEST(BufferListTest, Testrepeatedshutdown) { struct sock_extended_err serr; serr.ee_data = 213; serr.ee_info = grpc_core::SCM_TSTAMP_ACK; @@ -107,25 +108,18 @@ static void TestRepeatedShutdown() { gpr_atm_rel_store(&verifier_called, static_cast(0)); grpc_core::TracedBuffer::AddNewEntry(&list, 213, 0, &verifier_called); grpc_core::TracedBuffer::ProcessTimestamp(&list, &serr, nullptr, &tss); - GPR_ASSERT(gpr_atm_acq_load(&verifier_called) == static_cast(1)); - GPR_ASSERT(list == nullptr); + ASSERT_EQ(gpr_atm_acq_load(&verifier_called), static_cast(1)); + ASSERT_EQ(list, nullptr); grpc_core::TracedBuffer::Shutdown(&list, nullptr, GRPC_ERROR_NONE); grpc_core::TracedBuffer::Shutdown(&list, nullptr, GRPC_ERROR_NONE); grpc_core::TracedBuffer::Shutdown(&list, nullptr, GRPC_ERROR_NONE); } -static void TestTcpBufferList() { - TestVerifierCalledOnAck(); - TestShutdownFlushesList(); - TestRepeatedShutdown(); -} - int main(int argc, char** argv) { grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); - TestTcpBufferList(); - grpc_shutdown(); - return 0; + ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestGrpcScope grpc_scope; + return RUN_ALL_TESTS(); } #else /* GRPC_LINUX_ERRQUEUE */ diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc index 34e5c2b89d5..900e7b16ffb 100644 --- a/test/core/iomgr/combiner_test.cc +++ b/test/core/iomgr/combiner_test.cc @@ -18,6 +18,8 @@ #include "src/core/lib/iomgr/combiner.h" +#include + #include #include #include @@ -26,7 +28,7 @@ #include "src/core/lib/gprpp/thd.h" #include "test/core/util/test_config.h" -static void test_no_op(void) { +TEST(CombinerTest, TestNoOp) { gpr_log(GPR_DEBUG, "test_no_op"); grpc_core::ExecCtx exec_ctx; GRPC_COMBINER_UNREF(grpc_combiner_create(), "test_no_op"); @@ -36,7 +38,7 @@ static void set_event_to_true(void* value, grpc_error_handle /*error*/) { gpr_event_set(static_cast(value), reinterpret_cast(1)); } -static void test_execute_one(void) { +TEST(CombinerTest, TestExecuteOne) { gpr_log(GPR_DEBUG, "test_execute_one"); grpc_core::Combiner* lock = grpc_combiner_create(); @@ -46,8 +48,8 @@ static void test_execute_one(void) { lock->Run(GRPC_CLOSURE_CREATE(set_event_to_true, &done, nullptr), GRPC_ERROR_NONE); grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(gpr_event_wait(&done, grpc_timeout_seconds_to_deadline(5)) != - nullptr); + ASSERT_NE(gpr_event_wait(&done, grpc_timeout_seconds_to_deadline(5)), + nullptr); GRPC_COMBINER_UNREF(lock, "test_execute_one"); } @@ -64,7 +66,7 @@ typedef struct { static void check_one(void* a, grpc_error_handle /*error*/) { ex_args* args = static_cast(a); - GPR_ASSERT(*args->ctr == args->value - 1); + ASSERT_EQ(*args->ctr, args->value - 1); *args->ctr = args->value; gpr_free(a); } @@ -90,7 +92,7 @@ static void execute_many_loop(void* a) { GRPC_ERROR_NONE); } -static void test_execute_many(void) { +TEST(CombinerTest, TestExecuteMany) { gpr_log(GPR_DEBUG, "test_execute_many"); grpc_core::Combiner* lock = grpc_combiner_create(); @@ -104,8 +106,8 @@ static void test_execute_many(void) { thds[i].Start(); } for (size_t i = 0; i < GPR_ARRAY_SIZE(thds); i++) { - GPR_ASSERT(gpr_event_wait(&ta[i].done, - gpr_inf_future(GPR_CLOCK_REALTIME)) != nullptr); + ASSERT_NE(gpr_event_wait(&ta[i].done, gpr_inf_future(GPR_CLOCK_REALTIME)), + nullptr); thds[i].Join(); } grpc_core::ExecCtx exec_ctx; @@ -123,7 +125,7 @@ static void add_finally(void* arg, grpc_error_handle /*error*/) { GRPC_CLOSURE_CREATE(in_finally, arg, nullptr), GRPC_ERROR_NONE); } -static void test_execute_finally(void) { +TEST(CombinerTest, TestExecuteFinally) { gpr_log(GPR_DEBUG, "test_execute_finally"); grpc_core::Combiner* lock = grpc_combiner_create(); @@ -131,19 +133,15 @@ static void test_execute_finally(void) { gpr_event_init(&got_in_finally); lock->Run(GRPC_CLOSURE_CREATE(add_finally, lock, nullptr), GRPC_ERROR_NONE); grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(gpr_event_wait(&got_in_finally, - grpc_timeout_seconds_to_deadline(5)) != nullptr); + ASSERT_NE( + gpr_event_wait(&got_in_finally, grpc_timeout_seconds_to_deadline(5)), + nullptr); GRPC_COMBINER_UNREF(lock, "test_execute_finally"); } int main(int argc, char** argv) { grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); - test_no_op(); - test_execute_one(); - test_execute_finally(); - test_execute_many(); - grpc_shutdown(); - - return 0; + ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestGrpcScope grpc_scope; + return RUN_ALL_TESTS(); } diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc index e2ae7feae35..3eeb79b72f4 100644 --- a/test/core/iomgr/endpoint_pair_test.cc +++ b/test/core/iomgr/endpoint_pair_test.cc @@ -18,6 +18,8 @@ #include "src/core/lib/iomgr/endpoint_pair.h" +#include + #include #include #include @@ -58,9 +60,8 @@ static void destroy_pollset(void* p, grpc_error_handle /*error*/) { grpc_pollset_destroy(static_cast(p)); } -int main(int argc, char** argv) { +TEST(EndpointPairTest, MainTest) { grpc_closure destroyed; - grpc::testing::TestEnvironment env(&argc, argv); grpc_init(); { grpc_core::ExecCtx exec_ctx; @@ -73,6 +74,10 @@ int main(int argc, char** argv) { } grpc_shutdown(); gpr_free(g_pollset); +} - return 0; +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc index 4bfcdf05d99..519ed735b95 100644 --- a/test/core/iomgr/fd_conservation_posix_test.cc +++ b/test/core/iomgr/fd_conservation_posix_test.cc @@ -18,6 +18,8 @@ #include +#include + #include #include @@ -25,12 +27,11 @@ #include "src/core/lib/iomgr/iomgr.h" #include "test/core/util/test_config.h" -int main(int argc, char** argv) { +TEST(FdConservationPosixTest, MainTest) { int i; struct rlimit rlim; grpc_endpoint_pair p; - grpc::testing::TestEnvironment env(&argc, argv); grpc_init(); { grpc_core::ExecCtx exec_ctx; @@ -39,7 +40,7 @@ int main(int argc, char** argv) { verify we can create and destroy many more than this number of descriptors */ rlim.rlim_cur = rlim.rlim_max = 10; - GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim)); + ASSERT_EQ(setrlimit(RLIMIT_NOFILE, &rlim), 0); for (i = 0; i < 100; i++) { p = grpc_iomgr_create_endpoint_pair("test", nullptr); grpc_endpoint_destroy(p.client); @@ -49,5 +50,10 @@ int main(int argc, char** argv) { } grpc_shutdown(); - return 0; +} + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc index 769923ac5b8..0fed101850b 100644 --- a/test/core/iomgr/fd_posix_test.cc +++ b/test/core/iomgr/fd_posix_test.cc @@ -16,7 +16,10 @@ * */ +#include + #include "src/core/lib/iomgr/port.h" +#include "test/core/util/test_config.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_EV @@ -42,7 +45,6 @@ #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/socket_utils_posix.h" -#include "test/core/util/test_config.h" static gpr_mu* g_mu; static grpc_pollset* g_pollset; @@ -65,17 +67,18 @@ static void create_test_socket(int port, int* socket_fd, setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)); /* Reset the size of socket send buffer to the minimal value to facilitate buffer filling up and triggering notify_on_write */ - GPR_ASSERT(grpc_set_socket_sndbuf(fd, buffer_size_bytes) == GRPC_ERROR_NONE); - GPR_ASSERT(grpc_set_socket_rcvbuf(fd, buffer_size_bytes) == GRPC_ERROR_NONE); + ASSERT_EQ(grpc_set_socket_sndbuf(fd, buffer_size_bytes), GRPC_ERROR_NONE); + ASSERT_EQ(grpc_set_socket_rcvbuf(fd, buffer_size_bytes), GRPC_ERROR_NONE); /* Make fd non-blocking */ flags = fcntl(fd, F_GETFL, 0); - GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0); + ASSERT_EQ(fcntl(fd, F_SETFL, flags | O_NONBLOCK), 0); *socket_fd = fd; /* Use local address for test */ sin->sin_family = AF_INET; sin->sin_addr.s_addr = htonl(0x7f000001); - GPR_ASSERT(port >= 0 && port < 65536); + ASSERT_GE(port, 0); + ASSERT_LT(port, 65536); sin->sin_port = htons(static_cast(port)); } @@ -173,7 +176,7 @@ static void listen_shutdown_cb(void* arg /*server*/, int /*success*/) { gpr_mu_lock(g_mu); sv->done = 1; - GPR_ASSERT( + ASSERT_TRUE( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } @@ -196,8 +199,8 @@ static void listen_cb(void* arg, /*=sv_arg*/ fd = accept(grpc_fd_wrapped_fd(listen_em_fd), reinterpret_cast(&ss), &slen); - GPR_ASSERT(fd >= 0); - GPR_ASSERT(fd < FD_SETSIZE); + ASSERT_GE(fd, 0); + ASSERT_LT(fd, FD_SETSIZE); flags = fcntl(fd, F_GETFL, 0); fcntl(fd, F_SETFL, flags | O_NONBLOCK); se = static_cast(gpr_malloc(sizeof(*se))); @@ -226,10 +229,10 @@ static int server_start(server* sv) { create_test_socket(port, &fd, &sin); addr_len = sizeof(sin); - GPR_ASSERT(bind(fd, (struct sockaddr*)&sin, addr_len) == 0); - GPR_ASSERT(getsockname(fd, (struct sockaddr*)&sin, &addr_len) == 0); + EXPECT_EQ(bind(fd, (struct sockaddr*)&sin, addr_len), 0); + EXPECT_EQ(getsockname(fd, (struct sockaddr*)&sin, &addr_len), 0); port = ntohs(sin.sin_port); - GPR_ASSERT(listen(fd, MAX_NUM_FD) == 0); + EXPECT_EQ(listen(fd, MAX_NUM_FD), 0); sv->em_fd = grpc_fd_create(fd, "server", false); grpc_pollset_add_fd(g_pollset, sv->em_fd); @@ -247,7 +250,7 @@ static void server_wait_and_shutdown(server* sv) { while (!sv->done) { grpc_core::ExecCtx exec_ctx; grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, grpc_core::Timestamp::InfFuture()))); gpr_mu_unlock(g_mu); @@ -289,7 +292,7 @@ static void client_session_shutdown_cb(void* arg /*client*/, int /*success*/) { client* cl = static_cast(arg); grpc_fd_orphan(cl->em_fd, nullptr, nullptr, "c"); cl->done = 1; - GPR_ASSERT( + ASSERT_TRUE( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); } @@ -363,7 +366,7 @@ static void client_wait_and_shutdown(client* cl) { while (!cl->done) { grpc_pollset_worker* worker = nullptr; grpc_core::ExecCtx exec_ctx; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, grpc_core::Timestamp::InfFuture()))); gpr_mu_unlock(g_mu); @@ -389,7 +392,7 @@ static void test_grpc_fd(void) { client_wait_and_shutdown(&cl); server_wait_and_shutdown(&sv); - GPR_ASSERT(sv.read_bytes_total == cl.write_bytes_total); + ASSERT_EQ(sv.read_bytes_total, cl.write_bytes_total); gpr_log(GPR_INFO, "Total read bytes %" PRIdPTR, sv.read_bytes_total); } @@ -407,7 +410,7 @@ static void first_read_callback(void* arg /* fd_change_data */, gpr_mu_lock(g_mu); fdc->cb_that_ran = first_read_callback; - GPR_ASSERT( + ASSERT_TRUE( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } @@ -418,7 +421,7 @@ static void second_read_callback(void* arg /* fd_change_data */, gpr_mu_lock(g_mu); fdc->cb_that_ran = second_read_callback; - GPR_ASSERT( + ASSERT_TRUE( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } @@ -446,11 +449,11 @@ static void test_grpc_fd_change(void) { init_change_data(&a); init_change_data(&b); - GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); + ASSERT_EQ(socketpair(AF_UNIX, SOCK_STREAM, 0, sv), 0); flags = fcntl(sv[0], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0); + ASSERT_EQ(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK), 0); flags = fcntl(sv[1], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); + ASSERT_EQ(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK), 0); em_fd = grpc_fd_create(sv[0], "test_grpc_fd_change", false); grpc_pollset_add_fd(g_pollset, em_fd); @@ -459,37 +462,37 @@ static void test_grpc_fd_change(void) { grpc_fd_notify_on_read(em_fd, &first_closure); data = 0; result = write(sv[1], &data, 1); - GPR_ASSERT(result == 1); + ASSERT_EQ(result, 1); /* And now wait for it to run. */ gpr_mu_lock(g_mu); while (a.cb_that_ran == nullptr) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, grpc_core::Timestamp::InfFuture()))); gpr_mu_unlock(g_mu); gpr_mu_lock(g_mu); } - GPR_ASSERT(a.cb_that_ran == first_read_callback); + ASSERT_EQ(a.cb_that_ran, first_read_callback); gpr_mu_unlock(g_mu); /* And drain the socket so we can generate a new read edge */ result = read(sv[0], &data, 1); - GPR_ASSERT(result == 1); + ASSERT_EQ(result, 1); /* Now register a second callback with distinct change data, and do the same thing again. */ grpc_fd_notify_on_read(em_fd, &second_closure); data = 0; result = write(sv[1], &data, 1); - GPR_ASSERT(result == 1); + ASSERT_EQ(result, 1); gpr_mu_lock(g_mu); while (b.cb_that_ran == nullptr) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, grpc_core::Timestamp::InfFuture()))); gpr_mu_unlock(g_mu); @@ -497,7 +500,7 @@ static void test_grpc_fd_change(void) { gpr_mu_lock(g_mu); } /* Except now we verify that second_read_callback ran instead */ - GPR_ASSERT(b.cb_that_ran == second_read_callback); + ASSERT_EQ(b.cb_that_ran, second_read_callback); gpr_mu_unlock(g_mu); grpc_fd_orphan(em_fd, nullptr, nullptr, "d"); @@ -511,9 +514,8 @@ static void destroy_pollset(void* p, grpc_error_handle /*error*/) { grpc_pollset_destroy(static_cast(p)); } -int main(int argc, char** argv) { +TEST(FdPosixTest, MainTest) { grpc_closure destroyed; - grpc::testing::TestEnvironment env(&argc, argv); grpc_init(); { grpc_core::ExecCtx exec_ctx; @@ -528,11 +530,12 @@ int main(int argc, char** argv) { gpr_free(g_pollset); } grpc_shutdown(); - return 0; } -#else /* GRPC_POSIX_SOCKET_EV */ - -int main(int argc, char** argv) { return 1; } - #endif /* GRPC_POSIX_SOCKET_EV */ + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc index 2a75077b428..9224f55d75f 100644 --- a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc +++ b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc @@ -16,6 +16,8 @@ * */ +#include + #include #include @@ -28,12 +30,15 @@ #include "src/core/lib/iomgr/socket_utils_posix.h" #endif -int main(int argc, char** argv) { - grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); +TEST(GrpcIpv6LoopbackAvailableTest, MainTest) { // This test assumes that the ipv6 loopback is available // in all environments in which grpc tests run in. - GPR_ASSERT(grpc_ipv6_loopback_available()); - grpc_shutdown(); - return 0; + ASSERT_TRUE(grpc_ipv6_loopback_available()); +} + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestGrpcScope grpc_scope; + return RUN_ALL_TESTS(); } diff --git a/test/core/iomgr/load_file_test.cc b/test/core/iomgr/load_file_test.cc index b693d8576aa..e930bc7c036 100644 --- a/test/core/iomgr/load_file_test.cc +++ b/test/core/iomgr/load_file_test.cc @@ -21,6 +21,8 @@ #include #include +#include + #include #include #include @@ -34,7 +36,7 @@ static const char prefix[] = "file_test"; -static void test_load_empty_file(void) { +TEST(LoadFileTest, TestLoadEmptyFile) { FILE* tmp = nullptr; grpc_slice slice; grpc_slice slice_with_null_term; @@ -44,18 +46,18 @@ static void test_load_empty_file(void) { LOG_TEST_NAME("test_load_empty_file"); tmp = gpr_tmpfile(prefix, &tmp_name); - GPR_ASSERT(tmp_name != nullptr); - GPR_ASSERT(tmp != nullptr); + ASSERT_NE(tmp_name, nullptr); + ASSERT_NE(tmp, nullptr); fclose(tmp); error = grpc_load_file(tmp_name, 0, &slice); - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); - GPR_ASSERT(GRPC_SLICE_LENGTH(slice) == 0); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); + ASSERT_EQ(GRPC_SLICE_LENGTH(slice), 0); error = grpc_load_file(tmp_name, 1, &slice_with_null_term); - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); - GPR_ASSERT(GRPC_SLICE_LENGTH(slice_with_null_term) == 1); - GPR_ASSERT(GRPC_SLICE_START_PTR(slice_with_null_term)[0] == 0); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); + ASSERT_EQ(GRPC_SLICE_LENGTH(slice_with_null_term), 1); + ASSERT_EQ(GRPC_SLICE_START_PTR(slice_with_null_term)[0], 0); remove(tmp_name); gpr_free(tmp_name); @@ -63,7 +65,7 @@ static void test_load_empty_file(void) { grpc_slice_unref(slice_with_null_term); } -static void test_load_failure(void) { +TEST(LoadFileTest, TestLoadFailure) { FILE* tmp = nullptr; grpc_slice slice; grpc_error_handle error; @@ -72,20 +74,20 @@ static void test_load_failure(void) { LOG_TEST_NAME("test_load_failure"); tmp = gpr_tmpfile(prefix, &tmp_name); - GPR_ASSERT(tmp_name != nullptr); - GPR_ASSERT(tmp != nullptr); + ASSERT_NE(tmp_name, nullptr); + ASSERT_NE(tmp, nullptr); fclose(tmp); remove(tmp_name); error = grpc_load_file(tmp_name, 0, &slice); - GPR_ASSERT(!GRPC_ERROR_IS_NONE(error)); + ASSERT_FALSE(GRPC_ERROR_IS_NONE(error)); GRPC_ERROR_UNREF(error); - GPR_ASSERT(GRPC_SLICE_LENGTH(slice) == 0); + ASSERT_EQ(GRPC_SLICE_LENGTH(slice), 0); gpr_free(tmp_name); grpc_slice_unref(slice); } -static void test_load_small_file(void) { +TEST(LoadFileTest, TestLoadSmallFile) { FILE* tmp = nullptr; grpc_slice slice; grpc_slice slice_with_null_term; @@ -96,21 +98,20 @@ static void test_load_small_file(void) { LOG_TEST_NAME("test_load_small_file"); tmp = gpr_tmpfile(prefix, &tmp_name); - GPR_ASSERT(tmp_name != nullptr); - GPR_ASSERT(tmp != nullptr); - GPR_ASSERT(fwrite(blah, 1, strlen(blah), tmp) == strlen(blah)); + ASSERT_NE(tmp_name, nullptr); + ASSERT_NE(tmp, nullptr); + ASSERT_EQ(fwrite(blah, 1, strlen(blah), tmp), strlen(blah)); fclose(tmp); error = grpc_load_file(tmp_name, 0, &slice); - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); - GPR_ASSERT(GRPC_SLICE_LENGTH(slice) == strlen(blah)); - GPR_ASSERT(!memcmp(GRPC_SLICE_START_PTR(slice), blah, strlen(blah))); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); + ASSERT_EQ(GRPC_SLICE_LENGTH(slice), strlen(blah)); + ASSERT_FALSE(memcmp(GRPC_SLICE_START_PTR(slice), blah, strlen(blah))); error = grpc_load_file(tmp_name, 1, &slice_with_null_term); - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); - GPR_ASSERT(GRPC_SLICE_LENGTH(slice_with_null_term) == (strlen(blah) + 1)); - GPR_ASSERT(strcmp((const char*)GRPC_SLICE_START_PTR(slice_with_null_term), - blah) == 0); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); + ASSERT_EQ(GRPC_SLICE_LENGTH(slice_with_null_term), (strlen(blah) + 1)); + ASSERT_STREQ((const char*)GRPC_SLICE_START_PTR(slice_with_null_term), blah); remove(tmp_name); gpr_free(tmp_name); @@ -118,7 +119,7 @@ static void test_load_small_file(void) { grpc_slice_unref(slice_with_null_term); } -static void test_load_big_file(void) { +TEST(LoadFileTest, TestLoadBigFile) { FILE* tmp = nullptr; grpc_slice slice; grpc_error_handle error; @@ -133,17 +134,17 @@ static void test_load_big_file(void) { memset(buffer, 42, buffer_size); tmp = gpr_tmpfile(prefix, &tmp_name); - GPR_ASSERT(tmp != nullptr); - GPR_ASSERT(tmp_name != nullptr); - GPR_ASSERT(fwrite(buffer, 1, buffer_size, tmp) == buffer_size); + ASSERT_NE(tmp, nullptr); + ASSERT_NE(tmp_name, nullptr); + ASSERT_EQ(fwrite(buffer, 1, buffer_size, tmp), buffer_size); fclose(tmp); error = grpc_load_file(tmp_name, 0, &slice); - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); - GPR_ASSERT(GRPC_SLICE_LENGTH(slice) == buffer_size); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); + ASSERT_EQ(GRPC_SLICE_LENGTH(slice), buffer_size); current = GRPC_SLICE_START_PTR(slice); for (i = 0; i < buffer_size; i++) { - GPR_ASSERT(current[i] == 42); + ASSERT_EQ(current[i], 42); } remove(tmp_name); @@ -154,11 +155,7 @@ static void test_load_big_file(void) { int main(int argc, char** argv) { grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); - test_load_empty_file(); - test_load_failure(); - test_load_small_file(); - test_load_big_file(); - grpc_shutdown(); - return 0; + ::testing::InitGoogleTest(&argc, argv); + grpc::testing::TestGrpcScope grpc_scope; + return RUN_ALL_TESTS(); } diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc index 900a07232f3..2e2cfcf9cc8 100644 --- a/test/core/iomgr/resolve_address_posix_test.cc +++ b/test/core/iomgr/resolve_address_posix_test.cc @@ -22,6 +22,10 @@ #include +#include + +#include "absl/flags/flag.h" +#include "absl/flags/parse.h" #include "absl/strings/str_format.h" #include @@ -67,7 +71,7 @@ void args_init(args_struct* args) { } void args_finish(args_struct* args) { - GPR_ASSERT(gpr_event_wait(&args->ev, test_deadline())); + ASSERT_TRUE(gpr_event_wait(&args->ev, test_deadline())); args->thd.Join(); // Don't need to explicitly destruct args->thd since // args is actually going to be destructed, not just freed @@ -102,7 +106,7 @@ static void actually_poll(void* argsp) { deadline - grpc_core::ExecCtx::Get()->Now(); gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRId64, args->done, time_left.millis()); - GPR_ASSERT(time_left >= grpc_core::Duration::Zero()); + ASSERT_GE(time_left, grpc_core::Duration::Zero()); grpc_pollset_worker* worker = nullptr; GRPC_LOG_IF_ERROR( "pollset_work", @@ -121,8 +125,8 @@ namespace { void MustSucceed(args_struct* args, absl::StatusOr> result) { - GPR_ASSERT(result.ok()); - GPR_ASSERT(!result->empty()); + ASSERT_TRUE(result.ok()); + ASSERT_FALSE(result->empty()); grpc_core::MutexLockForGprMu lock(args->mu); args->done = true; GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(args->pollset, nullptr)); @@ -161,7 +165,7 @@ static void test_named_and_numeric_scope_ids(void) { break; } } - GPR_ASSERT(strlen(arbitrary_interface_name) > 0); + ASSERT_GT(strlen(arbitrary_interface_name), 0); // Test resolution of an ipv6 address with a named scope ID gpr_log(GPR_DEBUG, "test resolution with a named scope ID"); std::string target_with_named_scope_id = @@ -175,34 +179,30 @@ static void test_named_and_numeric_scope_ids(void) { resolve_address_must_succeed(target_with_numeric_scope_id.c_str()); } -int main(int argc, char** argv) { +ABSL_FLAG(std::string, resolver, "", "Resolver type (ares or native)"); + +TEST(ResolveAddressUsingAresResolverPosixTest, MainTest) { // First set the resolver type based off of --resolver - const char* resolver_type = nullptr; - gpr_cmdline* cl = gpr_cmdline_create("resolve address test"); - gpr_cmdline_add_string(cl, "resolver", "Resolver type (ares or native)", - &resolver_type); + std::string resolver_type = absl::GetFlag(FLAGS_resolver); // In case that there are more than one argument on the command line, // --resolver will always be the first one, so only parse the first argument // (other arguments may be unknown to cl) - gpr_cmdline_parse(cl, argc > 2 ? 2 : argc, argv); grpc_core::UniquePtr resolver = GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); if (strlen(resolver.get()) != 0) { gpr_log(GPR_INFO, "Warning: overriding resolver setting of %s", resolver.get()); } - if (resolver_type != nullptr && gpr_stricmp(resolver_type, "native") == 0) { + if (resolver_type == "native") { GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "native"); - } else if (resolver_type != nullptr && - gpr_stricmp(resolver_type, "ares") == 0) { + } else if (resolver_type == "ares") { GPR_GLOBAL_CONFIG_SET(grpc_dns_resolver, "ares"); } else { - gpr_log(GPR_ERROR, "--resolver_type was not set to ares or native"); - abort(); + gpr_log(GPR_ERROR, "--resolver was not set to ares or native"); + ASSERT_TRUE(false); } - grpc::testing::TestEnvironment env(&argc, argv); - grpc_init(); + grpc_init(); { grpc_core::ExecCtx exec_ctx; test_named_and_numeric_scope_ids(); @@ -212,8 +212,12 @@ int main(int argc, char** argv) { grpc_core::UniquePtr resolver = GPR_GLOBAL_CONFIG_GET(grpc_dns_resolver); } - gpr_cmdline_destroy(cl); - grpc_shutdown(); - return 0; +} + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + absl::ParseCommandLine(argc, argv); + return RUN_ALL_TESTS(); } diff --git a/test/core/iomgr/socket_utils_test.cc b/test/core/iomgr/socket_utils_test.cc index 48c1ed9424e..6176b644b23 100644 --- a/test/core/iomgr/socket_utils_test.cc +++ b/test/core/iomgr/socket_utils_test.cc @@ -26,6 +26,8 @@ #include #include +#include + #include #include #include @@ -102,25 +104,25 @@ static const grpc_socket_mutator_vtable mutator_vtable2 = { static void test_with_vtable(const grpc_socket_mutator_vtable* vtable) { int sock = socket(PF_INET, SOCK_STREAM, 0); - GPR_ASSERT(sock > 0); + ASSERT_GT(sock, 0); struct test_socket_mutator mutator; grpc_socket_mutator_init(&mutator.base, vtable); mutator.option_value = IPTOS_LOWDELAY; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "set_socket_with_mutator", grpc_set_socket_with_mutator(sock, GRPC_FD_CLIENT_CONNECTION_USAGE, (grpc_socket_mutator*)&mutator))); mutator.option_value = IPTOS_THROUGHPUT; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "set_socket_with_mutator", grpc_set_socket_with_mutator(sock, GRPC_FD_CLIENT_CONNECTION_USAGE, (grpc_socket_mutator*)&mutator))); mutator.option_value = IPTOS_RELIABILITY; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "set_socket_with_mutator", grpc_set_socket_with_mutator(sock, GRPC_FD_CLIENT_CONNECTION_USAGE, (grpc_socket_mutator*)&mutator))); @@ -129,40 +131,43 @@ static void test_with_vtable(const grpc_socket_mutator_vtable* vtable) { auto err = grpc_set_socket_with_mutator( sock, GRPC_FD_CLIENT_CONNECTION_USAGE, reinterpret_cast(&mutator)); - GPR_ASSERT(!GRPC_ERROR_IS_NONE(err)); + ASSERT_FALSE(GRPC_ERROR_IS_NONE(err)); GRPC_ERROR_UNREF(err); } -int main(int argc, char** argv) { +TEST(SocketUtilsTest, MainTest) { int sock; - grpc::testing::TestEnvironment env(&argc, argv); sock = socket(PF_INET, SOCK_STREAM, 0); - GPR_ASSERT(sock > 0); - - GPR_ASSERT(GRPC_LOG_IF_ERROR("set_socket_nonblocking", - grpc_set_socket_nonblocking(sock, 1))); - GPR_ASSERT(GRPC_LOG_IF_ERROR("set_socket_nonblocking", - grpc_set_socket_nonblocking(sock, 0))); - GPR_ASSERT(GRPC_LOG_IF_ERROR("set_socket_cloexec", - grpc_set_socket_cloexec(sock, 1))); - GPR_ASSERT(GRPC_LOG_IF_ERROR("set_socket_cloexec", - grpc_set_socket_cloexec(sock, 0))); - GPR_ASSERT(GRPC_LOG_IF_ERROR("set_socket_reuse_addr", - grpc_set_socket_reuse_addr(sock, 1))); - GPR_ASSERT(GRPC_LOG_IF_ERROR("set_socket_reuse_addr", - grpc_set_socket_reuse_addr(sock, 0))); - GPR_ASSERT(GRPC_LOG_IF_ERROR("set_socket_low_latency", - grpc_set_socket_low_latency(sock, 1))); - GPR_ASSERT(GRPC_LOG_IF_ERROR("set_socket_low_latency", - grpc_set_socket_low_latency(sock, 0))); + ASSERT_GT(sock, 0); + + ASSERT_TRUE(GRPC_LOG_IF_ERROR("set_socket_nonblocking", + grpc_set_socket_nonblocking(sock, 1))); + ASSERT_TRUE(GRPC_LOG_IF_ERROR("set_socket_nonblocking", + grpc_set_socket_nonblocking(sock, 0))); + ASSERT_TRUE(GRPC_LOG_IF_ERROR("set_socket_cloexec", + grpc_set_socket_cloexec(sock, 1))); + ASSERT_TRUE(GRPC_LOG_IF_ERROR("set_socket_cloexec", + grpc_set_socket_cloexec(sock, 0))); + ASSERT_TRUE(GRPC_LOG_IF_ERROR("set_socket_reuse_addr", + grpc_set_socket_reuse_addr(sock, 1))); + ASSERT_TRUE(GRPC_LOG_IF_ERROR("set_socket_reuse_addr", + grpc_set_socket_reuse_addr(sock, 0))); + ASSERT_TRUE(GRPC_LOG_IF_ERROR("set_socket_low_latency", + grpc_set_socket_low_latency(sock, 1))); + ASSERT_TRUE(GRPC_LOG_IF_ERROR("set_socket_low_latency", + grpc_set_socket_low_latency(sock, 0))); test_with_vtable(&mutator_vtable); test_with_vtable(&mutator_vtable2); close(sock); +} - return 0; +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } #else /* GRPC_POSIX_SOCKET_UTILS_COMMON */ diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc index dd10a717238..2af0a4bfa96 100644 --- a/test/core/iomgr/tcp_client_posix_test.cc +++ b/test/core/iomgr/tcp_client_posix_test.cc @@ -16,9 +16,12 @@ * */ +#include + #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "test/core/util/test_config.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP_CLIENT @@ -40,7 +43,6 @@ #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/resource_quota/api.h" -#include "test/core/util/test_config.h" static grpc_pollset_set* g_pollset_set; static gpr_mu* g_mu; @@ -57,15 +59,15 @@ static void finish_connection() { gpr_mu_lock(g_mu); g_connections_complete++; grpc_core::ExecCtx exec_ctx; - GPR_ASSERT( + ASSERT_TRUE( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } static void must_succeed(void* /*arg*/, grpc_error_handle error) { - GPR_ASSERT(g_connecting != nullptr); - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); + ASSERT_NE(g_connecting, nullptr); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); grpc_endpoint_shutdown(g_connecting, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "must_succeed called")); grpc_endpoint_destroy(g_connecting); @@ -74,8 +76,8 @@ static void must_succeed(void* /*arg*/, grpc_error_handle error) { } static void must_fail(void* /*arg*/, grpc_error_handle error) { - GPR_ASSERT(g_connecting == nullptr); - GPR_ASSERT(!GRPC_ERROR_IS_NONE(error)); + ASSERT_EQ(g_connecting, nullptr); + ASSERT_FALSE(GRPC_ERROR_IS_NONE(error)); finish_connection(); } @@ -96,18 +98,19 @@ void test_succeeds(void) { /* create a phony server */ svr_fd = socket(AF_INET, SOCK_STREAM, 0); - GPR_ASSERT(svr_fd >= 0); - GPR_ASSERT( - 0 == bind(svr_fd, (struct sockaddr*)addr, (socklen_t)resolved_addr.len)); - GPR_ASSERT(0 == listen(svr_fd, 1)); + ASSERT_GE(svr_fd, 0); + ASSERT_EQ(bind(svr_fd, (struct sockaddr*)addr, (socklen_t)resolved_addr.len), + 0); + ASSERT_EQ(listen(svr_fd, 1), 0); gpr_mu_lock(g_mu); connections_complete_before = g_connections_complete; gpr_mu_unlock(g_mu); /* connect to it */ - GPR_ASSERT(getsockname(svr_fd, (struct sockaddr*)addr, - (socklen_t*)&resolved_addr.len) == 0); + ASSERT_EQ(getsockname(svr_fd, (struct sockaddr*)addr, + (socklen_t*)&resolved_addr.len), + 0); GRPC_CLOSURE_INIT(&done, must_succeed, nullptr, grpc_schedule_on_exec_ctx); grpc_core::ChannelArgs args = grpc_core::CoreConfiguration::Get() .channel_args_preconditioning() @@ -121,14 +124,14 @@ void test_succeeds(void) { r = accept(svr_fd, reinterpret_cast(addr), reinterpret_cast(&resolved_addr.len)); } while (r == -1 && errno == EINTR); - GPR_ASSERT(r >= 0); + ASSERT_GE(r, 0); close(r); gpr_mu_lock(g_mu); while (g_connections_complete == connections_complete_before) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, grpc_core::Timestamp::FromTimespecRoundUp( @@ -141,7 +144,7 @@ void test_succeeds(void) { gpr_mu_unlock(g_mu); // A cancellation attempt should fail because connect already succeeded. - GPR_ASSERT(grpc_tcp_client_cancel_connect(connection_handle) == false); + ASSERT_EQ(grpc_tcp_client_cancel_connect(connection_handle), false); gpr_log(GPR_ERROR, "---- finished test_succeeds() ----"); } @@ -181,7 +184,7 @@ void test_fails(void) { polling_deadline = grpc_core::Timestamp::ProcessEpoch(); ABSL_FALLTHROUGH_INTENDED; case GRPC_TIMERS_CHECKED_AND_EMPTY: - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, polling_deadline))); break; @@ -194,7 +197,7 @@ void test_fails(void) { gpr_mu_unlock(g_mu); // A cancellation attempt should fail because connect already failed. - GPR_ASSERT(grpc_tcp_client_cancel_connect(connection_handle) == false); + ASSERT_EQ(grpc_tcp_client_cancel_connect(connection_handle), false); gpr_log(GPR_ERROR, "---- finished test_fails() ----"); } @@ -214,15 +217,16 @@ void test_connect_cancellation_succeeds(void) { /* create a phony server */ svr_fd = socket(AF_INET, SOCK_STREAM, 0); - GPR_ASSERT(svr_fd >= 0); - GPR_ASSERT( - 0 == bind(svr_fd, (struct sockaddr*)addr, (socklen_t)resolved_addr.len)); - GPR_ASSERT(0 == listen(svr_fd, 1)); + ASSERT_GE(svr_fd, 0); + ASSERT_EQ(bind(svr_fd, (struct sockaddr*)addr, (socklen_t)resolved_addr.len), + 0); + ASSERT_EQ(listen(svr_fd, 1), 0); // connect to it. accept() is not called on the bind socket. So the connection // should appear to be stuck giving ample time to try to cancel it. - GPR_ASSERT(getsockname(svr_fd, (struct sockaddr*)addr, - (socklen_t*)&resolved_addr.len) == 0); + ASSERT_EQ(getsockname(svr_fd, (struct sockaddr*)addr, + (socklen_t*)&resolved_addr.len), + 0); GRPC_CLOSURE_INIT(&done, must_succeed, nullptr, grpc_schedule_on_exec_ctx); grpc_core::ChannelArgs args = grpc_core::CoreConfiguration::Get() .channel_args_preconditioning() @@ -230,8 +234,8 @@ void test_connect_cancellation_succeeds(void) { int64_t connection_handle = grpc_tcp_client_connect( &done, &g_connecting, g_pollset_set, args.ToC().get(), &resolved_addr, grpc_core::Timestamp::InfFuture()); - GPR_ASSERT(connection_handle > 0); - GPR_ASSERT(grpc_tcp_client_cancel_connect(connection_handle) == true); + ASSERT_GT(connection_handle, 0); + ASSERT_EQ(grpc_tcp_client_cancel_connect(connection_handle), true); close(svr_fd); gpr_log(GPR_ERROR, "---- finished test_connect_cancellation_succeeds() ----"); } @@ -266,7 +270,7 @@ void test_fails_bad_addr_no_leak(void) { polling_deadline = grpc_core::Timestamp::ProcessEpoch(); ABSL_FALLTHROUGH_INTENDED; case GRPC_TIMERS_CHECKED_AND_EMPTY: - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, polling_deadline))); break; @@ -283,9 +287,8 @@ static void destroy_pollset(void* p, grpc_error_handle /*error*/) { grpc_pollset_destroy(static_cast(p)); } -int main(int argc, char** argv) { +TEST(TcpClientPosixTest, MainTest) { grpc_closure destroyed; - grpc::testing::TestEnvironment env(&argc, argv); grpc_init(); { @@ -307,11 +310,12 @@ int main(int argc, char** argv) { grpc_shutdown(); gpr_free(g_pollset); - return 0; } -#else /* GRPC_POSIX_SOCKET_TCP_CLIENT */ - -int main(int argc, char** argv) { return 1; } - #endif /* GRPC_POSIX_SOCKET_CLIENT */ + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc index 89a634a07ac..b6a4ead0d32 100644 --- a/test/core/iomgr/tcp_posix_test.cc +++ b/test/core/iomgr/tcp_posix_test.cc @@ -16,8 +16,11 @@ * */ +#include + #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "test/core/util/test_config.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP @@ -42,7 +45,6 @@ #include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/slice/slice_internal.h" #include "test/core/iomgr/endpoint_tests.h" -#include "test/core/util/test_config.h" static gpr_mu* g_mu; static grpc_pollset* g_pollset; @@ -67,11 +69,11 @@ GPR_GLOBAL_CONFIG_DECLARE_BOOL(grpc_experimental_enable_tcp_frame_size_tuning); static void create_sockets(int sv[2]) { int flags; - GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); + ASSERT_EQ(socketpair(AF_UNIX, SOCK_STREAM, 0, sv), 0); flags = fcntl(sv[0], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0); + ASSERT_EQ(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK), 0); flags = fcntl(sv[1], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); + ASSERT_EQ(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK), 0); } static void create_inet_sockets(int sv[2]) { @@ -80,16 +82,16 @@ static void create_inet_sockets(int sv[2]) { memset(&addr, 0, sizeof(struct sockaddr_in)); addr.sin_family = AF_INET; int sock = socket(AF_INET, SOCK_STREAM, 0); - GPR_ASSERT(sock); - GPR_ASSERT(bind(sock, (sockaddr*)&addr, sizeof(sockaddr_in)) == 0); + ASSERT_TRUE(sock); + ASSERT_EQ(bind(sock, (sockaddr*)&addr, sizeof(sockaddr_in)), 0); listen(sock, 1); /* Prepare client socket and connect to server */ socklen_t len = sizeof(sockaddr_in); - GPR_ASSERT(getsockname(sock, (sockaddr*)&addr, &len) == 0); + ASSERT_EQ(getsockname(sock, (sockaddr*)&addr, &len), 0); int client = socket(AF_INET, SOCK_STREAM, 0); - GPR_ASSERT(client); + ASSERT_TRUE(client); int ret; do { ret = connect(client, reinterpret_cast(&addr), @@ -102,14 +104,14 @@ static void create_inet_sockets(int sv[2]) { do { server = accept(sock, reinterpret_cast(&addr), &len); } while (server == -1 && errno == EINTR); - GPR_ASSERT(server != -1); + ASSERT_NE(server, -1); sv[0] = server; sv[1] = client; int flags = fcntl(sv[0], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK) == 0); + ASSERT_EQ(fcntl(sv[0], F_SETFL, flags | O_NONBLOCK), 0); flags = fcntl(sv[1], F_GETFL, 0); - GPR_ASSERT(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK) == 0); + ASSERT_EQ(fcntl(sv[1], F_SETFL, flags | O_NONBLOCK), 0); } static ssize_t fill_socket(int fd) { @@ -126,7 +128,7 @@ static ssize_t fill_socket(int fd) { total_bytes += write_bytes; } } while (write_bytes >= 0 || errno == EINTR); - GPR_ASSERT(errno == EAGAIN); + EXPECT_EQ(errno, EAGAIN); return total_bytes; } @@ -168,7 +170,7 @@ static size_t count_slices(grpc_slice* slices, size_t nslices, for (i = 0; i < nslices; ++i) { buf = GRPC_SLICE_START_PTR(slices[i]); for (j = 0; j < GRPC_SLICE_LENGTH(slices[i]); ++j) { - GPR_ASSERT(buf[j] == *current_data); + EXPECT_EQ(buf[j], *current_data); *current_data = (*current_data + 1) % 256; } num_bytes += GRPC_SLICE_LENGTH(slices[i]); @@ -182,20 +184,20 @@ static void read_cb(void* user_data, grpc_error_handle error) { size_t read_bytes; int current_data; - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); gpr_mu_lock(g_mu); current_data = state->read_bytes % 256; // The number of bytes read each time this callback is invoked must be >= // the min_progress_size. - GPR_ASSERT(state->min_progress_size <= state->incoming.length); + ASSERT_LE(state->min_progress_size, state->incoming.length); read_bytes = count_slices(state->incoming.slices, state->incoming.count, ¤t_data); state->read_bytes += read_bytes; gpr_log(GPR_INFO, "Read %" PRIuPTR " bytes of %" PRIuPTR, read_bytes, state->target_read_bytes); if (state->read_bytes >= state->target_read_bytes) { - GPR_ASSERT( + ASSERT_TRUE( GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } else { @@ -252,13 +254,13 @@ static void read_test(size_t num_bytes, size_t slice_size, gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); gpr_mu_lock(g_mu); } - GPR_ASSERT(state.read_bytes == state.target_read_bytes); + ASSERT_EQ(state.read_bytes, state.target_read_bytes); gpr_mu_unlock(g_mu); grpc_slice_buffer_destroy_internal(&state.incoming); @@ -312,13 +314,13 @@ static void large_read_test(size_t slice_size, int min_progress_size) { gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); gpr_mu_lock(g_mu); } - GPR_ASSERT(state.read_bytes == state.target_read_bytes); + ASSERT_EQ(state.read_bytes, state.target_read_bytes); gpr_mu_unlock(g_mu); grpc_slice_buffer_destroy_internal(&state.incoming); @@ -352,18 +354,18 @@ static grpc_slice* allocate_blocks(size_t num_bytes, size_t slice_size, (*current_data)++; } } - GPR_ASSERT(num_bytes_left == 0); + EXPECT_EQ(num_bytes_left, 0); return slices; } static void write_done(void* user_data /* write_socket_state */, grpc_error_handle error) { - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); struct write_socket_state* state = static_cast(user_data); gpr_mu_lock(g_mu); state->write_done = 1; - GPR_ASSERT( + ASSERT_TRUE( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } @@ -378,12 +380,12 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { grpc_core::ExecCtx exec_ctx; flags = fcntl(fd, F_GETFL, 0); - GPR_ASSERT(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) == 0); + ASSERT_EQ(fcntl(fd, F_SETFL, flags & ~O_NONBLOCK), 0); for (;;) { grpc_pollset_worker* worker = nullptr; gpr_mu_lock(g_mu); - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, grpc_core::Timestamp::FromTimespecRoundUp( @@ -394,16 +396,16 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { bytes_read = read(fd, buf, bytes_left > read_size ? read_size : bytes_left); } while (bytes_read < 0 && errno == EINTR); - GPR_ASSERT(bytes_read >= 0); + ASSERT_GE(bytes_read, 0); for (i = 0; i < bytes_read; ++i) { - GPR_ASSERT(buf[i] == current); + ASSERT_EQ(buf[i], current); current = (current + 1) % 256; } bytes_left -= static_cast(bytes_read); if (bytes_left == 0) break; } flags = fcntl(fd, F_GETFL, 0); - GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0); + ASSERT_EQ(fcntl(fd, F_SETFL, flags | O_NONBLOCK), 0); gpr_free(buf); } @@ -411,11 +413,11 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) { /* Verifier for timestamps callback for write_test */ void timestamps_verifier(void* arg, grpc_core::Timestamps* ts, grpc_error_handle error) { - GPR_ASSERT(GRPC_ERROR_IS_NONE(error)); - GPR_ASSERT(arg != nullptr); - GPR_ASSERT(ts->sendmsg_time.time.clock_type == GPR_CLOCK_REALTIME); - GPR_ASSERT(ts->scheduled_time.time.clock_type == GPR_CLOCK_REALTIME); - GPR_ASSERT(ts->acked_time.time.clock_type == GPR_CLOCK_REALTIME); + ASSERT_TRUE(GRPC_ERROR_IS_NONE(error)); + ASSERT_NE(arg, nullptr); + ASSERT_EQ(ts->sendmsg_time.time.clock_type, GPR_CLOCK_REALTIME); + ASSERT_EQ(ts->scheduled_time.time.clock_type, GPR_CLOCK_REALTIME); + ASSERT_EQ(ts->acked_time.time.clock_type, GPR_CLOCK_REALTIME); gpr_atm* done_timestamps = static_cast(arg); gpr_atm_rel_store(done_timestamps, static_cast(1)); } @@ -492,7 +494,7 @@ static void write_test(size_t num_bytes, size_t slice_size, gpr_atm_acq_load(&done_timestamps) == static_cast(1))) { break; } - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_mu_unlock(g_mu); exec_ctx.Flush(); @@ -510,7 +512,7 @@ static void write_test(size_t num_bytes, size_t slice_size, void on_fd_released(void* arg, grpc_error_handle /*errors*/) { int* done = static_cast(arg); *done = 1; - GPR_ASSERT( + ASSERT_TRUE( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); } @@ -547,7 +549,8 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { grpc_channel_args args = {GPR_ARRAY_SIZE(a), a}; ep = grpc_tcp_create(grpc_fd_create(sv[1], "read_test", false), &args, "test"); - GPR_ASSERT(grpc_tcp_fd(ep) == sv[1] && sv[1] >= 0); + ASSERT_EQ(grpc_tcp_fd(ep), sv[1]); + ASSERT_GE(sv[1], 0); grpc_endpoint_add_to_pollset(ep, g_pollset); written_bytes = fill_socket_partial(sv[0], num_bytes); @@ -566,7 +569,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { gpr_mu_lock(g_mu); while (state.read_bytes < state.target_read_bytes) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_log(GPR_DEBUG, "wakeup: read=%" PRIdPTR " target=%" PRIdPTR, state.read_bytes, state.target_read_bytes); @@ -574,7 +577,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(g_mu); } - GPR_ASSERT(state.read_bytes == state.target_read_bytes); + ASSERT_EQ(state.read_bytes, state.target_read_bytes); gpr_mu_unlock(g_mu); grpc_slice_buffer_destroy_internal(&state.incoming); @@ -583,13 +586,13 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) { gpr_mu_lock(g_mu); while (!fd_released_done) { grpc_pollset_worker* worker = nullptr; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline))); gpr_log(GPR_DEBUG, "wakeup: fd_released_done=%d", fd_released_done); } gpr_mu_unlock(g_mu); - GPR_ASSERT(fd_released_done == 1); - GPR_ASSERT(fd == sv[1]); + ASSERT_EQ(fd_released_done, 1); + ASSERT_EQ(fd, sv[1]); written_bytes = fill_socket_partial(sv[0], num_bytes); drain_socket_blocking(fd, written_bytes, written_bytes); @@ -668,9 +671,8 @@ static void destroy_pollset(void* p, grpc_error_handle /*error*/) { grpc_pollset_destroy(static_cast(p)); } -int main(int argc, char** argv) { +TEST(TcpPosixTest, MainTest) { grpc_closure destroyed; - grpc::testing::TestEnvironment env(&argc, argv); GPR_GLOBAL_CONFIG_SET(grpc_experimental_enable_tcp_frame_size_tuning, true); grpc_init(); grpc_core::grpc_tcp_set_write_timestamps_callback(timestamps_verifier); @@ -688,12 +690,12 @@ int main(int argc, char** argv) { } grpc_shutdown(); gpr_free(g_pollset); - - return 0; } -#else /* GRPC_POSIX_SOCKET_TCP */ - -int main(int argc, char** argv) { return 1; } - #endif /* GRPC_POSIX_SOCKET_TCP */ + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc index f7a36e9ade4..f65a950cebd 100644 --- a/test/core/iomgr/tcp_server_posix_test.cc +++ b/test/core/iomgr/tcp_server_posix_test.cc @@ -16,8 +16,11 @@ * */ +#include + #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/port.h" +#include "test/core/util/test_config.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP_SERVER @@ -47,7 +50,6 @@ #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/resource_quota/api.h" #include "test/core/util/port.h" -#include "test/core/util/test_config.h" #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", #x) @@ -157,7 +159,7 @@ static void on_connect(void* /*arg*/, grpc_endpoint* tcp, gpr_mu_lock(g_mu); g_result = temp_result; g_nconnects++; - GPR_ASSERT( + ASSERT_TRUE( GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, nullptr))); gpr_mu_unlock(g_mu); } @@ -169,8 +171,7 @@ static void test_no_op(void) { .channel_args_preconditioning() .PreconditionChannelArgs(nullptr) .ToC(); - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(nullptr, args.get(), &s)); + ASSERT_EQ(GRPC_ERROR_NONE, grpc_tcp_server_create(nullptr, args.get(), &s)); grpc_tcp_server_unref(s); } @@ -181,8 +182,7 @@ static void test_no_op_with_start(void) { .channel_args_preconditioning() .PreconditionChannelArgs(nullptr) .ToC(); - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(nullptr, args.get(), &s)); + ASSERT_EQ(GRPC_ERROR_NONE, grpc_tcp_server_create(nullptr, args.get(), &s)); LOG_TEST("test_no_op_with_start"); std::vector empty_pollset; grpc_tcp_server_start(s, &empty_pollset, on_connect, nullptr); @@ -199,17 +199,16 @@ static void test_no_op_with_port(void) { .channel_args_preconditioning() .PreconditionChannelArgs(nullptr) .ToC(); - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(nullptr, args.get(), &s)); + ASSERT_EQ(GRPC_ERROR_NONE, grpc_tcp_server_create(nullptr, args.get(), &s)); LOG_TEST("test_no_op_with_port"); memset(&resolved_addr, 0, sizeof(resolved_addr)); resolved_addr.len = static_cast(sizeof(struct sockaddr_in)); addr->sin_family = AF_INET; int port = -1; - GPR_ASSERT(grpc_tcp_server_add_port(s, &resolved_addr, &port) == - GRPC_ERROR_NONE && - port > 0); + ASSERT_EQ(grpc_tcp_server_add_port(s, &resolved_addr, &port), + GRPC_ERROR_NONE); + ASSERT_GT(port, 0); grpc_tcp_server_unref(s); } @@ -224,17 +223,16 @@ static void test_no_op_with_port_and_start(void) { .channel_args_preconditioning() .PreconditionChannelArgs(nullptr) .ToC(); - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(nullptr, args.get(), &s)); + ASSERT_EQ(GRPC_ERROR_NONE, grpc_tcp_server_create(nullptr, args.get(), &s)); LOG_TEST("test_no_op_with_port_and_start"); int port = -1; memset(&resolved_addr, 0, sizeof(resolved_addr)); resolved_addr.len = static_cast(sizeof(struct sockaddr_in)); addr->sin_family = AF_INET; - GPR_ASSERT(grpc_tcp_server_add_port(s, &resolved_addr, &port) == - GRPC_ERROR_NONE && - port > 0); + ASSERT_EQ(grpc_tcp_server_add_port(s, &resolved_addr, &port), + GRPC_ERROR_NONE); + ASSERT_GT(port, 0); std::vector empty_pollset; grpc_tcp_server_start(s, &empty_pollset, on_connect, nullptr); @@ -325,8 +323,8 @@ static void test_connect(size_t num_connects, .channel_args_preconditioning() .PreconditionChannelArgs(channel_args) .ToC(); - GPR_ASSERT(GRPC_ERROR_NONE == - grpc_tcp_server_create(nullptr, new_channel_args.get(), &s)); + ASSERT_EQ(GRPC_ERROR_NONE, + grpc_tcp_server_create(nullptr, new_channel_args.get(), &s)); unsigned port_num; server_weak_ref weak_ref; server_weak_ref_init(&weak_ref); @@ -343,34 +341,34 @@ static void test_connect(size_t num_connects, resolved_addr.len = static_cast(sizeof(struct sockaddr_storage)); resolved_addr1.len = static_cast(sizeof(struct sockaddr_storage)); addr->ss_family = addr1->ss_family = AF_INET; - GPR_ASSERT(GRPC_LOG_IF_ERROR( + ASSERT_TRUE(GRPC_LOG_IF_ERROR( "grpc_tcp_server_add_port", grpc_tcp_server_add_port(s, &resolved_addr, &svr_port))); gpr_log(GPR_INFO, "Allocated port %d", svr_port); - GPR_ASSERT(svr_port > 0); + ASSERT_GT(svr_port, 0); /* Cannot use wildcard (port==0), because add_port() will try to reuse the same port as a previous add_port(). */ svr1_port = grpc_pick_unused_port_or_die(); - GPR_ASSERT(svr1_port > 0); + ASSERT_GT(svr1_port, 0); gpr_log(GPR_INFO, "Picked unused port %d", svr1_port); grpc_sockaddr_set_port(&resolved_addr1, svr1_port); - GPR_ASSERT(grpc_tcp_server_add_port(s, &resolved_addr1, &port) == - GRPC_ERROR_NONE && - port == svr1_port); + ASSERT_EQ(grpc_tcp_server_add_port(s, &resolved_addr1, &port), + GRPC_ERROR_NONE); + ASSERT_EQ(port, svr1_port); /* Bad port_index. */ - GPR_ASSERT(grpc_tcp_server_port_fd_count(s, 2) == 0); - GPR_ASSERT(grpc_tcp_server_port_fd(s, 2, 0) < 0); + ASSERT_EQ(grpc_tcp_server_port_fd_count(s, 2), 0); + ASSERT_LT(grpc_tcp_server_port_fd(s, 2, 0), 0); /* Bad fd_index. */ - GPR_ASSERT(grpc_tcp_server_port_fd(s, 0, 100) < 0); - GPR_ASSERT(grpc_tcp_server_port_fd(s, 1, 100) < 0); + ASSERT_LT(grpc_tcp_server_port_fd(s, 0, 100), 0); + ASSERT_LT(grpc_tcp_server_port_fd(s, 1, 100), 0); /* Got at least one fd per port. */ svr_fd_count = grpc_tcp_server_port_fd_count(s, 0); - GPR_ASSERT(svr_fd_count >= 1); + ASSERT_GE(svr_fd_count, 1); svr1_fd_count = grpc_tcp_server_port_fd_count(s, 1); - GPR_ASSERT(svr1_fd_count >= 1); + ASSERT_GE(svr1_fd_count, 1); std::vector test_pollset; test_pollset.push_back(g_pollset); @@ -390,7 +388,7 @@ static void test_connect(size_t num_connects, dst.str); continue; } - GPR_ASSERT(grpc_sockaddr_set_port(&dst.addr, ports[port_num])); + ASSERT_TRUE(grpc_sockaddr_set_port(&dst.addr, ports[port_num])); test_addr_init_str(&dst); ++num_tested; on_connect_result_init(&result); @@ -400,11 +398,11 @@ static void test_connect(size_t num_connects, } gpr_log(GPR_ERROR, "Failed to connect to %s: %s", dst.str, grpc_error_std_string(err).c_str()); - GPR_ASSERT(test_dst_addrs); + ASSERT_TRUE(test_dst_addrs); dst_addrs->addrs[dst_idx].addr.len = 0; GRPC_ERROR_UNREF(err); } - GPR_ASSERT(num_tested > 0); + ASSERT_GT(num_tested, 0); } } else { for (port_num = 0; port_num < num_ports; ++port_num) { @@ -414,46 +412,47 @@ static void test_connect(size_t num_connects, int fd = grpc_tcp_server_port_fd(s, port_num, fd_num); size_t connect_num; test_addr dst; - GPR_ASSERT(fd >= 0); + ASSERT_GE(fd, 0); dst.addr.len = static_cast(sizeof(dst.addr.addr)); - GPR_ASSERT(getsockname(fd, (struct sockaddr*)dst.addr.addr, - (socklen_t*)&dst.addr.len) == 0); - GPR_ASSERT(dst.addr.len <= sizeof(dst.addr.addr)); + ASSERT_EQ(getsockname(fd, (struct sockaddr*)dst.addr.addr, + (socklen_t*)&dst.addr.len), + 0); + ASSERT_LE(dst.addr.len, sizeof(dst.addr.addr)); test_addr_init_str(&dst); gpr_log(GPR_INFO, "(%d, %d) fd %d family %s listening on %s", port_num, fd_num, fd, sock_family_name(addr->ss_family), dst.str); for (connect_num = 0; connect_num < num_connects; ++connect_num) { on_connect_result result; on_connect_result_init(&result); - GPR_ASSERT( + ASSERT_TRUE( GRPC_LOG_IF_ERROR("tcp_connect", tcp_connect(&dst, &result))); - GPR_ASSERT(result.server_fd == fd); - GPR_ASSERT(result.port_index == port_num); - GPR_ASSERT(result.fd_index == fd_num); - GPR_ASSERT(result.server == s); - GPR_ASSERT( - grpc_tcp_server_port_fd(s, result.port_index, result.fd_index) == + ASSERT_EQ(result.server_fd, fd); + ASSERT_EQ(result.port_index, port_num); + ASSERT_EQ(result.fd_index, fd_num); + ASSERT_EQ(result.server, s); + ASSERT_EQ( + grpc_tcp_server_port_fd(s, result.port_index, result.fd_index), result.server_fd); } } } } /* Weak ref to server valid until final unref. */ - GPR_ASSERT(weak_ref.server != nullptr); - GPR_ASSERT(grpc_tcp_server_port_fd(s, 0, 0) >= 0); + ASSERT_NE(weak_ref.server, nullptr); + ASSERT_GE(grpc_tcp_server_port_fd(s, 0, 0), 0); grpc_tcp_server_unref(s); grpc_core::ExecCtx::Get()->Flush(); /* Weak ref lost. */ - GPR_ASSERT(weak_ref.server == nullptr); + ASSERT_EQ(weak_ref.server, nullptr); } static void destroy_pollset(void* p, grpc_error_handle /*error*/) { grpc_pollset_destroy(static_cast(p)); } -int main(int argc, char** argv) { +TEST(TcpServerPosixTest, MainTest) { grpc_closure destroyed; grpc_arg chan_args[1]; chan_args[0].type = GRPC_ARG_INTEGER; @@ -464,7 +463,6 @@ int main(int argc, char** argv) { struct ifaddrs* ifa_it; // Zalloc dst_addrs to avoid oversized frames. test_addrs* dst_addrs = grpc_core::Zalloc(); - grpc::testing::TestEnvironment env(&argc, argv); grpc_init(); // wait a few seconds to make sure IPv6 link-local addresses can be bound // if we are running under docker container that has just started. @@ -482,8 +480,7 @@ int main(int argc, char** argv) { test_no_op_with_port_and_start(); if (getifaddrs(&ifa) != 0 || ifa == nullptr) { - gpr_log(GPR_ERROR, "getifaddrs: %s", strerror(errno)); - return EXIT_FAILURE; + FAIL() << "getifaddrs: " << strerror(errno); } dst_addrs->naddrs = 0; for (ifa_it = ifa; ifa_it != nullptr && dst_addrs->naddrs < MAX_ADDRS; @@ -501,7 +498,7 @@ int main(int argc, char** argv) { } memcpy(dst_addrs->addrs[dst_addrs->naddrs].addr.addr, ifa_it->ifa_addr, dst_addrs->addrs[dst_addrs->naddrs].addr.len); - GPR_ASSERT( + ASSERT_TRUE( grpc_sockaddr_set_port(&dst_addrs->addrs[dst_addrs->naddrs].addr, 0)); test_addr_init_str(&dst_addrs->addrs[dst_addrs->naddrs]); ++dst_addrs->naddrs; @@ -529,11 +526,12 @@ int main(int argc, char** argv) { grpc_shutdown(); gpr_free(dst_addrs); gpr_free(g_pollset); - return EXIT_SUCCESS; } -#else /* GRPC_POSIX_SOCKET_SERVER */ - -int main(int argc, char** argv) { return 1; } - #endif /* GRPC_POSIX_SOCKET_SERVER */ + +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc index 0e5e402aa91..10edea7fe27 100644 --- a/test/core/iomgr/timer_heap_test.cc +++ b/test/core/iomgr/timer_heap_test.cc @@ -21,6 +21,8 @@ #include #include +#include + #include #include @@ -54,10 +56,10 @@ static void check_valid(grpc_timer_heap* pq) { size_t left_child = 1u + 2u * i; size_t right_child = left_child + 1u; if (left_child < pq->timer_count) { - GPR_ASSERT(pq->timers[i]->deadline <= pq->timers[left_child]->deadline); + ASSERT_LE(pq->timers[i]->deadline, pq->timers[left_child]->deadline); } if (right_child < pq->timer_count) { - GPR_ASSERT(pq->timers[i]->deadline <= pq->timers[right_child]->deadline); + ASSERT_LE(pq->timers[i]->deadline, pq->timers[right_child]->deadline); } } } @@ -78,22 +80,22 @@ static void test1(void) { grpc_timer_heap_init(&pq); memset(inpq, 0, num_test_elements); - GPR_ASSERT(grpc_timer_heap_is_empty(&pq)); + ASSERT_TRUE(grpc_timer_heap_is_empty(&pq)); check_valid(&pq); for (i = 0; i < num_test_elements; ++i) { - GPR_ASSERT(!contains(&pq, &test_elements[i])); + ASSERT_FALSE(contains(&pq, &test_elements[i])); grpc_timer_heap_add(&pq, &test_elements[i]); check_valid(&pq); - GPR_ASSERT(contains(&pq, &test_elements[i])); + ASSERT_TRUE(contains(&pq, &test_elements[i])); inpq[i] = 1; } for (i = 0; i < num_test_elements; ++i) { /* Test that check still succeeds even for element that wasn't just inserted. */ - GPR_ASSERT(contains(&pq, &test_elements[i])); + ASSERT_TRUE(contains(&pq, &test_elements[i])); } - GPR_ASSERT(pq.timer_count == num_test_elements); + ASSERT_EQ(pq.timer_count, num_test_elements); check_valid(&pq); @@ -101,16 +103,16 @@ static void test1(void) { size_t elem_num = static_cast(rand()) % num_test_elements; grpc_timer* el = &test_elements[elem_num]; if (!inpq[elem_num]) { /* not in pq */ - GPR_ASSERT(!contains(&pq, el)); + ASSERT_FALSE(contains(&pq, el)); el->deadline = random_deadline(); grpc_timer_heap_add(&pq, el); - GPR_ASSERT(contains(&pq, el)); + ASSERT_TRUE(contains(&pq, el)); inpq[elem_num] = 1; check_valid(&pq); } else { - GPR_ASSERT(contains(&pq, el)); + ASSERT_TRUE(contains(&pq, el)); grpc_timer_heap_remove(&pq, el); - GPR_ASSERT(!contains(&pq, el)); + ASSERT_FALSE(contains(&pq, el)); inpq[elem_num] = 0; check_valid(&pq); } @@ -193,7 +195,7 @@ static void test2(void) { grpc_timer_heap_pop(&pq); for (size_t i = 0; i < elems_size; i++) { if (top == &elems[i].elem) { - GPR_ASSERT(elems[i].inserted); + ASSERT_TRUE(elems[i].inserted); elems[i].inserted = false; } } @@ -215,7 +217,7 @@ static void test2(void) { } } } - GPR_ASSERT(grpc_timer_heap_top(&pq)->deadline == *min_deadline); + ASSERT_EQ(grpc_timer_heap_top(&pq)->deadline, *min_deadline); } } @@ -238,10 +240,10 @@ static void shrink_test(void) { /* Create a priority queue with many elements. Make sure the Size() is correct. */ for (i = 0; i < num_elements; ++i) { - GPR_ASSERT(i == pq.timer_count); + ASSERT_EQ(i, pq.timer_count); grpc_timer_heap_add(&pq, create_test_elements(1)); } - GPR_ASSERT(num_elements == pq.timer_count); + ASSERT_EQ(num_elements, pq.timer_count); /* Remove elements until the Size is 1/4 the original size. */ while (pq.timer_count > num_elements / 4) { @@ -249,12 +251,12 @@ static void shrink_test(void) { grpc_timer_heap_remove(&pq, te); gpr_free(te); } - GPR_ASSERT(num_elements / 4 == pq.timer_count); + ASSERT_EQ(num_elements / 4, pq.timer_count); /* Expect that Capacity is in the right range: Size * 2 <= Capacity <= Size * 4 */ - GPR_ASSERT(pq.timer_count * 2 <= pq.timer_capacity); - GPR_ASSERT(pq.timer_capacity <= pq.timer_count * 4); + ASSERT_LE(pq.timer_count * 2, pq.timer_capacity); + ASSERT_LE(pq.timer_capacity, pq.timer_count * 4); check_valid(&pq); /* Remove the rest of the elements. Check that the Capacity is not more than @@ -266,32 +268,33 @@ static void shrink_test(void) { grpc_timer_heap_remove(&pq, te); gpr_free(te); expected_size--; - GPR_ASSERT(expected_size == pq.timer_count); - GPR_ASSERT(pq.timer_count * 2 <= pq.timer_capacity); + ASSERT_EQ(expected_size, pq.timer_count); + ASSERT_LE(pq.timer_count * 2, pq.timer_capacity); if (pq.timer_count >= 8) { - GPR_ASSERT(pq.timer_capacity <= pq.timer_count * 4); + ASSERT_LE(pq.timer_capacity, pq.timer_count * 4); } else { - GPR_ASSERT(16 <= pq.timer_capacity); + ASSERT_LE(16, pq.timer_capacity); } check_valid(&pq); } - GPR_ASSERT(0 == pq.timer_count); - GPR_ASSERT(pq.timer_capacity >= 16 && pq.timer_capacity < 32); + ASSERT_EQ(pq.timer_count, 0); + ASSERT_GE(pq.timer_capacity, 16); + ASSERT_LT(pq.timer_capacity, 32); grpc_timer_heap_destroy(&pq); } -int main(int argc, char** argv) { - int i; - - grpc::testing::TestEnvironment env(&argc, argv); - - for (i = 0; i < 5; i++) { +TEST(TimerHeapTest, MainTest) { + for (int i = 0; i < 5; i++) { test1(); test2(); shrink_test(); } +} - return 0; +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc index 96be56a185e..883ce6d22fe 100644 --- a/test/core/iomgr/timer_list_test.cc +++ b/test/core/iomgr/timer_list_test.cc @@ -21,6 +21,8 @@ #include #include +#include + #include #include @@ -77,38 +79,38 @@ static void add_test(void) { /* collect timers. Only the first batch should be ready. */ grpc_core::ExecCtx::Get()->TestOnlySetNow( start + grpc_core::Duration::Milliseconds(500)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + ASSERT_EQ(grpc_timer_check(nullptr), GRPC_TIMERS_FIRED); grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 20; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 10)); - GPR_ASSERT(cb_called[i][0] == 0); + ASSERT_EQ(cb_called[i][1], (i < 10)); + ASSERT_EQ(cb_called[i][0], 0); } grpc_core::ExecCtx::Get()->TestOnlySetNow( start + grpc_core::Duration::Milliseconds(600)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); + ASSERT_EQ(grpc_timer_check(nullptr), GRPC_TIMERS_CHECKED_AND_EMPTY); grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 30; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 10)); - GPR_ASSERT(cb_called[i][0] == 0); + ASSERT_EQ(cb_called[i][1], (i < 10)); + ASSERT_EQ(cb_called[i][0], 0); } /* collect the rest of the timers */ grpc_core::ExecCtx::Get()->TestOnlySetNow( start + grpc_core::Duration::Milliseconds(1500)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + ASSERT_EQ(grpc_timer_check(nullptr), GRPC_TIMERS_FIRED); grpc_core::ExecCtx::Get()->Flush(); for (i = 0; i < 30; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 20)); - GPR_ASSERT(cb_called[i][0] == 0); + ASSERT_EQ(cb_called[i][1], (i < 20)); + ASSERT_EQ(cb_called[i][0], 0); } grpc_core::ExecCtx::Get()->TestOnlySetNow( start + grpc_core::Duration::Milliseconds(1600)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_CHECKED_AND_EMPTY); + ASSERT_EQ(grpc_timer_check(nullptr), GRPC_TIMERS_CHECKED_AND_EMPTY); for (i = 0; i < 30; i++) { - GPR_ASSERT(cb_called[i][1] == (i < 20)); - GPR_ASSERT(cb_called[i][0] == 0); + ASSERT_EQ(cb_called[i][1], (i < 20)); + ASSERT_EQ(cb_called[i][0], 0); } grpc_timer_list_shutdown(); @@ -145,19 +147,19 @@ void destruction_test(void) { GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)4, grpc_schedule_on_exec_ctx)); grpc_core::ExecCtx::Get()->TestOnlySetNow( grpc_core::Timestamp::FromMillisecondsAfterProcessEpoch(2)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + ASSERT_EQ(grpc_timer_check(nullptr), GRPC_TIMERS_FIRED); grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(1 == cb_called[4][1]); + ASSERT_EQ(cb_called[4][1], 1); grpc_timer_cancel(&timers[0]); grpc_timer_cancel(&timers[3]); grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(1 == cb_called[0][0]); - GPR_ASSERT(1 == cb_called[3][0]); + ASSERT_EQ(cb_called[0][0], 1); + ASSERT_EQ(cb_called[3][0], 1); grpc_timer_list_shutdown(); grpc_core::ExecCtx::Get()->Flush(); - GPR_ASSERT(1 == cb_called[1][0]); - GPR_ASSERT(1 == cb_called[2][0]); + ASSERT_EQ(cb_called[1][0], 1); + ASSERT_EQ(cb_called[2][0], 1); } /* Cleans up a list with pending timers that simulate long-running-services. @@ -179,7 +181,7 @@ void long_running_service_cleanup_test(void) { gpr_log(GPR_INFO, "long_running_service_cleanup_test"); grpc_core::Timestamp now = grpc_core::ExecCtx::Get()->Now(); - GPR_ASSERT(now.milliseconds_after_process_epoch() >= k25Days.millis()); + ASSERT_GE(now.milliseconds_after_process_epoch(), k25Days.millis()); grpc_timer_list_init(); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_trace); grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_check_trace); @@ -208,32 +210,31 @@ void long_running_service_cleanup_test(void) { grpc_core::ExecCtx::Get()->TestOnlySetNow( now + grpc_core::Duration::Milliseconds(4)); - GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED); + ASSERT_EQ(grpc_timer_check(nullptr), GRPC_TIMERS_FIRED); grpc_core::ExecCtx::Get()->Flush(); GPR_ASSERT(0 == cb_called[0][0]); // Timer 0 not called - GPR_ASSERT(0 == cb_called[0][1]); - GPR_ASSERT(0 == cb_called[1][0]); + ASSERT_EQ(cb_called[0][1], 0); + ASSERT_EQ(cb_called[1][0], 0); GPR_ASSERT(1 == cb_called[1][1]); // Timer 1 fired GPR_ASSERT(0 == cb_called[2][0]); // Timer 2 not called - GPR_ASSERT(0 == cb_called[2][1]); + ASSERT_EQ(cb_called[2][1], 0); GPR_ASSERT(0 == cb_called[3][0]); // Timer 3 not called - GPR_ASSERT(0 == cb_called[3][1]); + ASSERT_EQ(cb_called[3][1], 0); grpc_timer_list_shutdown(); grpc_core::ExecCtx::Get()->Flush(); /* Timers 0, 2, and 3 were fired with an error during cleanup */ - GPR_ASSERT(1 == cb_called[0][0]); - GPR_ASSERT(0 == cb_called[1][0]); - GPR_ASSERT(1 == cb_called[2][0]); - GPR_ASSERT(1 == cb_called[3][0]); + ASSERT_EQ(cb_called[0][0], 1); + ASSERT_EQ(cb_called[1][0], 0); + ASSERT_EQ(cb_called[2][0], 1); + ASSERT_EQ(cb_called[3][0], 1); } -int main(int argc, char** argv) { +TEST(TimerListTest, MainTest) { gpr_time_init(); /* Tests with default g_start_time */ { - grpc::testing::TestEnvironment env(&argc, argv); grpc_core::ExecCtx exec_ctx; grpc_set_default_iomgr_platform(); grpc_iomgr_platform_init(); @@ -245,7 +246,6 @@ int main(int argc, char** argv) { /* Begin long running service tests */ { - grpc::testing::TestEnvironment env(&argc, argv); /* Set g_start_time back 25 days. */ /* We set g_start_time here in case there are any initialization dependencies that use g_start_time. */ @@ -262,6 +262,10 @@ int main(int argc, char** argv) { destruction_test(); grpc_iomgr_platform_shutdown(); } +} - return 0; +int main(int argc, char** argv) { + grpc::testing::TestEnvironment env(&argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index e8e4983c02b..c8b4f5c2916 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -69,52 +69,6 @@ ], "uses_polling": true }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "buffer_list_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": true - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "combiner_test", - "platforms": [ - "linux", - "mac", - "posix" - ], - "uses_polling": true - }, { "args": [], "benchmark": false, @@ -161,74 +115,6 @@ ], "uses_polling": true }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "endpoint_pair_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": true - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "fd_conservation_posix_test", - "platforms": [ - "linux", - "mac", - "posix" - ], - "uses_polling": true - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "fd_posix_test", - "platforms": [ - "linux", - "mac", - "posix" - ], - "uses_polling": true - }, { "args": [], "benchmark": false, @@ -297,30 +183,6 @@ ], "uses_polling": true }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "grpc_ipv6_loopback_available_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": true - }, { "args": [], "benchmark": false, @@ -369,30 +231,6 @@ ], "uses_polling": true }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "load_file_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, { "args": [], "benchmark": false, @@ -489,188 +327,6 @@ ], "uses_polling": true }, - { - "args": [ - "--resolver=ares" - ], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "resolve_address_using_ares_resolver_posix_test", - "platforms": [ - "linux", - "mac", - "posix" - ], - "uses_polling": true - }, - { - "args": [ - "--resolver=native" - ], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "resolve_address_using_native_resolver_posix_test", - "platforms": [ - "linux", - "mac", - "posix" - ], - "uses_polling": true - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "socket_utils_test", - "platforms": [ - "linux", - "mac", - "posix" - ], - "uses_polling": true - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "tcp_client_posix_test", - "platforms": [ - "linux", - "mac", - "posix" - ], - "uses_polling": true - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "posix" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "tcp_posix_test", - "platforms": [ - "linux", - "posix" - ], - "uses_polling": true - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "tcp_server_posix_test", - "platforms": [ - "linux", - "mac", - "posix" - ], - "uses_polling": true - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "test_core_iomgr_timer_heap_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "test_core_iomgr_timer_list_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false - }, { "args": [], "benchmark": false, @@ -1619,6 +1275,30 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "buffer_list_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, @@ -2361,6 +2041,28 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "combiner_test", + "platforms": [ + "linux", + "mac", + "posix" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, @@ -2839,6 +2541,30 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "endpoint_pair_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, @@ -3025,7 +2751,55 @@ "posix", "windows" ], - "uses_polling": true + "uses_polling": true + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "exec_ctx_wakeup_scheduler_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "fake_binder_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false }, { "args": [], @@ -3042,14 +2816,14 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "exec_ctx_wakeup_scheduler_test", + "name": "fake_resolver_test", "platforms": [ "linux", "mac", "posix", "windows" ], - "uses_polling": false + "uses_polling": true }, { "args": [], @@ -3066,14 +2840,14 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "fake_binder_test", + "name": "fake_transport_security_test", "platforms": [ "linux", "mac", "posix", "windows" ], - "uses_polling": false + "uses_polling": true }, { "args": [], @@ -3081,8 +2855,7 @@ "ci_platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "cpu_cost": 1.0, "exclude_configs": [], @@ -3090,12 +2863,11 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "fake_resolver_test", + "name": "fd_conservation_posix_test", "platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "uses_polling": true }, @@ -3105,8 +2877,7 @@ "ci_platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "cpu_cost": 1.0, "exclude_configs": [], @@ -3114,12 +2885,11 @@ "flaky": false, "gtest": true, "language": "c++", - "name": "fake_transport_security_test", + "name": "fd_posix_test", "platforms": [ "linux", "mac", - "posix", - "windows" + "posix" ], "uses_polling": true }, @@ -3595,6 +3365,30 @@ ], "uses_polling": true }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "grpc_ipv6_loopback_available_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, @@ -4473,6 +4267,30 @@ ], "uses_polling": true }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "load_file_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, { "args": [], "benchmark": false, @@ -5541,6 +5359,30 @@ ], "uses_polling": true }, + { + "args": [ + "--resolver=ares" + ], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "resolve_address_using_ares_resolver_posix_test", + "platforms": [ + "linux", + "mac", + "posix" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, @@ -5565,6 +5407,30 @@ ], "uses_polling": true }, + { + "args": [ + "--resolver=native" + ], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "resolve_address_using_native_resolver_posix_test", + "platforms": [ + "linux", + "mac", + "posix" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, @@ -6325,6 +6191,28 @@ ], "uses_polling": true }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "socket_utils_test", + "platforms": [ + "linux", + "mac", + "posix" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, @@ -6749,6 +6637,70 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "tcp_client_posix_test", + "platforms": [ + "linux", + "mac", + "posix" + ], + "uses_polling": true + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "posix" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "tcp_posix_test", + "platforms": [ + "linux", + "posix" + ], + "uses_polling": true + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "tcp_server_posix_test", + "platforms": [ + "linux", + "mac", + "posix" + ], + "uses_polling": true + }, { "args": [], "benchmark": false, @@ -6869,6 +6821,54 @@ ], "uses_polling": false }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "test_core_iomgr_timer_heap_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "test_core_iomgr_timer_list_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": false + }, { "args": [], "benchmark": false,