Merge pull request #17441 from yang-g/gpr_test_util_to_grpc_test_util

Fold gpr_test_util to grpc_test_util

1 files changed, 41 insertions, 248 deletions

diff --git a/build.yaml b/build.yaml
index 8e80cf3fb0..830123110a 100644
--- a/build.yaml
+++ b/build.yaml
@@ -915,6 +915,7 @@ filegroups:
   - test/core/util/port_server_client.h
   - test/core/util/slice_splitter.h
   - test/core/util/subprocess.h
+  - test/core/util/test_config.h
   - test/core/util/tracer_util.h
   - test/core/util/trickle_endpoint.h
   src:
@@ -938,10 +939,10 @@ filegroups:
   - test/core/util/slice_splitter.cc
   - test/core/util/subprocess_posix.cc
   - test/core/util/subprocess_windows.cc
+  - test/core/util/test_config.cc
   - test/core/util/tracer_util.cc
   - test/core/util/trickle_endpoint.cc
   deps:
-  - gpr_test_util
   - gpr
   uses:
   - cmdline
@@ -1506,16 +1507,6 @@ libs:
   filegroups:
   - gpr_base
   secure: false
-- name: gpr_test_util
-  build: private
-  language: c
-  headers:
-  - test/core/util/test_config.h
-  src:
-  - test/core/util/test_config.cc
-  deps:
-  - gpr
-  secure: false
 - name: grpc
   build: all
   language: c
@@ -1578,7 +1569,6 @@ libs:
   - test/core/end2end/data/test_root_cert.cc
   - test/core/security/oauth2_utils.cc
   deps:
-  - gpr_test_util
   - gpr
   - grpc
   filegroups:
@@ -1588,7 +1578,6 @@ libs:
   language: c
   deps:
   - gpr
-  - gpr_test_util
   - grpc_unsecure
   filegroups:
   - grpc_test_util_base
@@ -1635,7 +1624,6 @@ libs:
   - test_tcp_server
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: test_tcp_server
   build: private
@@ -1647,7 +1635,6 @@ libs:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: grpc++
   build: all
@@ -1976,7 +1963,6 @@ libs:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
 - name: interop_server_helper
@@ -2006,7 +1992,6 @@ libs:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
 - name: interop_server_main
@@ -2079,7 +2064,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: alloc_test
@@ -2088,8 +2072,9 @@ targets:
   src:
   - test/core/gpr/alloc_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: alpn_test
   build: test
@@ -2099,7 +2084,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: alts_credentials_fuzzer
   build: fuzzer
@@ -2109,7 +2093,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/security/corpus/alts_credentials_corpus
@@ -2122,7 +2105,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/end2end/fuzzers/api_fuzzer_corpus
@@ -2135,8 +2117,9 @@ targets:
   src:
   - test/core/gpr/arena_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: avl_test
   build: test
@@ -2144,8 +2127,8 @@ targets:
   src:
   - test/core/avl/avl_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util
   - grpc
   uses_polling: false
 - name: bad_server_response_test
@@ -2157,7 +2140,6 @@ targets:
   - test_tcp_server
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2187,7 +2169,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2201,7 +2182,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: check_epollexclusive
   build: tool
@@ -2219,7 +2199,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: chttp2_stream_map_test
@@ -2230,7 +2209,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: chttp2_varint_test
@@ -2241,7 +2219,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: client_fuzzer
@@ -2252,7 +2229,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/end2end/fuzzers/client_fuzzer_corpus
@@ -2265,8 +2241,8 @@ targets:
   - test/core/util/cmdline_test.cc
   deps:
   - gpr
-  - gpr_test_util
   - grpc_test_util
+  - grpc
   uses_polling: false
 - name: combiner_test
   cpu_cost: 10
@@ -2277,7 +2253,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: compression_test
   build: test
@@ -2287,7 +2262,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: concurrent_connectivity_test
@@ -2299,7 +2273,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2312,7 +2285,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: dns_resolver_connectivity_test
   cpu_cost: 0.1
@@ -2323,7 +2295,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2335,7 +2306,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: dns_resolver_test
   build: test
@@ -2345,7 +2315,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: dualstack_socket_test
   cpu_cost: 0.1
@@ -2356,7 +2325,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2372,7 +2340,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2385,7 +2352,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: ev_epollex_linux_test
@@ -2397,7 +2363,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2411,7 +2376,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: fake_transport_security_test
   build: test
@@ -2419,8 +2383,8 @@ targets:
   src:
   - test/core/tsi/fake_transport_security_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util
   - grpc
   filegroups:
   - transport_security_test_lib
@@ -2436,7 +2400,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2452,7 +2415,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2469,7 +2431,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: fling_server
   build: test
@@ -2480,7 +2441,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: fling_stream_test
   cpu_cost: 1.5
@@ -2491,7 +2451,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - mac
@@ -2506,7 +2465,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - mac
@@ -2518,8 +2476,9 @@ targets:
   src:
   - test/core/gprpp/fork_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   platforms:
   - mac
   - linux
@@ -2533,7 +2492,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2548,8 +2506,9 @@ targets:
   src:
   - test/core/gpr/cpu_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_env_test
   build: test
@@ -2557,8 +2516,9 @@ targets:
   src:
   - test/core/gpr/env_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_host_port_test
   build: test
@@ -2566,8 +2526,9 @@ targets:
   src:
   - test/core/gpr/host_port_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_log_test
   build: test
@@ -2575,8 +2536,9 @@ targets:
   src:
   - test/core/gpr/log_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_manual_constructor_test
   cpu_cost: 3
@@ -2585,8 +2547,9 @@ targets:
   src:
   - test/core/gprpp/manual_constructor_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_mpscq_test
   cpu_cost: 30
@@ -2595,8 +2558,9 @@ targets:
   src:
   - test/core/gpr/mpscq_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_spinlock_test
   cpu_cost: 3
@@ -2605,8 +2569,9 @@ targets:
   src:
   - test/core/gpr/spinlock_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_string_test
   build: test
@@ -2614,8 +2579,9 @@ targets:
   src:
   - test/core/gpr/string_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_sync_test
   cpu_cost: 10
@@ -2624,8 +2590,9 @@ targets:
   src:
   - test/core/gpr/sync_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_thd_test
   cpu_cost: 10
@@ -2634,8 +2601,9 @@ targets:
   src:
   - test/core/gprpp/thd_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_time_test
   build: test
@@ -2643,8 +2611,9 @@ targets:
   src:
   - test/core/gpr/time_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_tls_test
   build: test
@@ -2652,8 +2621,9 @@ targets:
   src:
   - test/core/gpr/tls_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: gpr_useful_test
   build: test
@@ -2661,8 +2631,9 @@ targets:
   src:
   - test/core/gpr/useful_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: grpc_auth_context_test
   build: test
@@ -2672,7 +2643,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: grpc_b64_test
@@ -2683,7 +2653,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: grpc_byte_buffer_reader_test
@@ -2694,7 +2663,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: grpc_channel_args_test
@@ -2705,7 +2673,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: grpc_channel_stack_builder_test
@@ -2716,7 +2683,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: grpc_channel_stack_test
   build: test
@@ -2726,7 +2692,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: grpc_completion_queue_test
@@ -2737,7 +2702,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: grpc_completion_queue_threading_test
   build: test
@@ -2747,7 +2711,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2771,7 +2734,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: grpc_fetch_oauth2
   build: test
@@ -2782,7 +2744,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: grpc_ipv6_loopback_available_test
   build: test
@@ -2792,7 +2753,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2804,7 +2764,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - linux
@@ -2819,7 +2778,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: grpc_print_google_default_creds_token
@@ -2841,7 +2799,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: grpc_ssl_credentials_test
   build: test
@@ -2851,7 +2808,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: grpc_verify_jwt
   build: tool
@@ -2872,7 +2828,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2890,7 +2845,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2908,7 +2862,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2923,7 +2876,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -2947,7 +2899,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/transport/chttp2/hpack_parser_corpus
@@ -2961,7 +2912,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: hpack_table_test
@@ -2972,7 +2922,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: http_parser_test
@@ -2983,7 +2932,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: http_request_fuzzer_test
@@ -2994,7 +2942,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/http/request_corpus
@@ -3007,7 +2954,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/http/response_corpus
@@ -3020,7 +2966,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: httpcli_test
   cpu_cost: 0.5
@@ -3031,7 +2976,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - mac
@@ -3046,7 +2990,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - linux
@@ -3058,7 +3001,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: inproc_callback_test
@@ -3071,7 +3013,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: invalid_call_argument_test
@@ -3083,7 +3024,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: json_fuzzer_test
   build: fuzzer
@@ -3093,7 +3033,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/json/corpus
@@ -3107,7 +3046,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: json_rewrite_test
@@ -3118,7 +3056,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: json_stream_error_test
@@ -3129,7 +3066,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: json_test
@@ -3140,7 +3076,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: lame_client_test
@@ -3151,7 +3086,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: load_file_test
   build: test
@@ -3161,7 +3095,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: low_level_ping_pong_benchmark
@@ -3172,7 +3105,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - mac
@@ -3187,7 +3119,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: memory_usage_server
@@ -3199,7 +3130,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: memory_usage_test
   cpu_cost: 1.5
@@ -3210,7 +3140,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - mac
@@ -3224,7 +3153,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: minimal_stack_is_minimal_test
@@ -3235,7 +3163,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: multiple_server_queues_test
@@ -3246,7 +3173,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: murmur_hash_test
   build: test
@@ -3254,8 +3180,9 @@ targets:
   src:
   - test/core/gpr/murmur_hash_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util_unsecure
+  - grpc_unsecure
   uses_polling: false
 - name: nanopb_fuzzer_response_test
   build: fuzzer
@@ -3265,7 +3192,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/nanopb/corpus_response
@@ -3278,7 +3204,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/nanopb/corpus_serverlist
@@ -3292,7 +3217,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: num_external_connectivity_watchers_test
   build: test
@@ -3302,7 +3226,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3314,7 +3237,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: percent_decode_fuzzer
@@ -3325,7 +3247,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/slice/percent_decode_corpus
@@ -3338,7 +3259,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/slice/percent_encode_corpus
@@ -3351,7 +3271,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: resolve_address_posix_test
@@ -3362,7 +3281,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3378,7 +3296,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   args:
   - --resolver=ares
@@ -3390,7 +3307,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   args:
   - --resolver=native
@@ -3403,7 +3319,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: secure_channel_create_test
   build: test
@@ -3413,7 +3328,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: secure_endpoint_test
   build: test
@@ -3423,7 +3337,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3435,7 +3348,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3447,7 +3359,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: server_fuzzer
   build: fuzzer
@@ -3457,7 +3368,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/end2end/fuzzers/server_fuzzer_corpus
@@ -3471,7 +3381,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: slice_buffer_test
   build: test
@@ -3481,7 +3390,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: slice_string_helpers_test
@@ -3492,7 +3400,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: slice_test
@@ -3503,7 +3410,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: sockaddr_resolver_test
@@ -3514,7 +3420,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: sockaddr_utils_test
   build: test
@@ -3524,7 +3429,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: socket_utils_test
   build: test
@@ -3534,7 +3438,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3550,7 +3453,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/security/corpus/ssl_server_corpus
@@ -3561,8 +3463,8 @@ targets:
   src:
   - test/core/tsi/ssl_transport_security_test.cc
   deps:
-  - gpr_test_util
   - gpr
+  - grpc_test_util
   - grpc
   filegroups:
   - transport_security_test_lib
@@ -3578,7 +3480,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: stream_compression_test
@@ -3589,7 +3490,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: stream_owned_slice_test
@@ -3600,7 +3500,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: tcp_client_posix_test
@@ -3612,7 +3511,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3629,7 +3527,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - native
@@ -3642,7 +3539,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3658,7 +3554,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3674,7 +3569,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - native
@@ -3686,7 +3580,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: timeout_encoding_test
@@ -3697,7 +3590,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: timer_heap_test
@@ -3708,7 +3600,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3721,7 +3612,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3734,7 +3624,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: transport_metadata_test
   build: test
@@ -3744,7 +3633,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: transport_security_test
   build: test
@@ -3754,7 +3642,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - linux
@@ -3768,7 +3655,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3784,7 +3670,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   corpus_dirs:
   - test/core/client_channel/uri_corpus
@@ -3797,7 +3682,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: wakeup_fd_cv_test
   build: test
@@ -3807,7 +3691,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_iomgrs:
   - uv
@@ -3826,7 +3709,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
 - name: alts_counter_test
   build: test
@@ -3844,8 +3726,8 @@ targets:
   - test/core/tsi/alts/crypt/aes_gcm_test.cc
   deps:
   - alts_test_util
-  - gpr_test_util
   - gpr
+  - grpc_test_util
   - grpc
 - name: alts_crypter_test
   build: test
@@ -3958,7 +3840,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: auth_property_iterator_test
   gtest: true
@@ -3971,7 +3852,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: backoff_test
@@ -3982,7 +3862,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: bdp_estimator_test
@@ -3995,7 +3874,6 @@ targets:
   - grpc++
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: bm_arena
@@ -4010,7 +3888,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4032,7 +3909,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4054,7 +3930,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4076,7 +3951,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4098,7 +3972,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4120,7 +3993,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4141,7 +4013,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4162,7 +4033,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4183,7 +4053,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4205,7 +4074,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4229,7 +4097,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4256,7 +4123,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4281,7 +4147,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4310,7 +4175,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4335,7 +4199,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4357,7 +4220,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   benchmark: true
@@ -4375,7 +4237,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: channel_arguments_test
@@ -4411,7 +4272,6 @@ targets:
   - grpc++_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   filegroups:
   - grpcpp_channelz_proto
@@ -4428,7 +4288,6 @@ targets:
   - grpc++_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses:
   - grpc++_test
@@ -4445,7 +4304,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   filegroups:
   - grpcpp_channelz_proto
@@ -4460,7 +4318,6 @@ targets:
   - grpc++_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   filegroups:
   - grpcpp_channelz_proto
@@ -4491,7 +4348,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: true
 - name: cli_call_test
@@ -4506,7 +4362,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: client_callback_end2end_test
   gtest: true
@@ -4520,7 +4375,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: client_channel_stress_test
   gtest: false
@@ -4535,7 +4389,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: client_crash_test
   gtest: true
@@ -4549,7 +4402,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - mac
@@ -4566,7 +4418,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: client_interceptors_end2end_test
   gtest: true
@@ -4583,7 +4434,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: client_lb_end2end_test
   gtest: true
@@ -4596,7 +4446,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: codegen_test_full
   gtest: true
@@ -4649,7 +4498,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: credentials_test
@@ -4672,7 +4520,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: cxx_slice_test
@@ -4685,7 +4532,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: cxx_string_ref_test
@@ -4708,7 +4554,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: end2end_test
@@ -4726,7 +4571,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: error_details_test
   gtest: true
@@ -4749,7 +4593,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: filter_end2end_test
   gtest: true
@@ -4762,7 +4605,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: generic_end2end_test
   gtest: true
@@ -4775,7 +4617,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: golden_file_test
   gtest: true
@@ -4837,7 +4678,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: grpc_node_plugin
   build: protoc
@@ -4895,7 +4735,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   filegroups:
   - grpc++_codegen_proto
@@ -4923,7 +4762,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: h2_ssl_cert_test
   gtest: true
@@ -4937,7 +4775,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses:
   - grpc++_test
@@ -4953,7 +4790,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses:
   - grpc++_test
@@ -4968,7 +4804,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: http2_client
   build: test
@@ -4997,7 +4832,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: inlined_vector_test
   gtest: true
@@ -5009,7 +4843,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses:
   - grpc++_test
@@ -5025,7 +4858,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   platforms:
@@ -5044,7 +4876,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   platforms:
@@ -5064,7 +4895,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   platforms:
@@ -5080,7 +4910,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   platforms:
@@ -5098,7 +4927,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   platforms:
@@ -5115,7 +4943,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses:
   - grpc++_test
@@ -5148,7 +4975,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: nonblocking_test
   gtest: true
@@ -5161,7 +4987,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: noop-benchmark
   build: test
@@ -5181,7 +5006,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses:
   - grpc++_test
@@ -5198,7 +5022,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: proto_utils_test
   gtest: true
@@ -5225,7 +5048,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   platforms:
@@ -5246,7 +5068,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
 - name: qps_openloop_test
@@ -5262,7 +5083,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   platforms:
@@ -5285,7 +5105,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
 - name: raw_end2end_test
@@ -5299,7 +5118,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: reconnect_interop_client
   build: test
@@ -5315,7 +5133,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
 - name: reconnect_interop_server
@@ -5334,7 +5151,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
 - name: ref_counted_ptr_test
@@ -5347,7 +5163,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses:
   - grpc++_test
@@ -5361,7 +5176,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses:
   - grpc++_test
@@ -5374,7 +5188,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: secure_auth_context_test
@@ -5388,7 +5201,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: secure_sync_unary_ping_pong_test
   build: test
@@ -5402,7 +5214,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
   platforms:
@@ -5420,7 +5231,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: server_builder_test
   gtest: true
@@ -5433,7 +5243,6 @@ targets:
   deps:
   - grpc++_test_util_unsecure
   - grpc_test_util_unsecure
-  - gpr_test_util
   - grpc++_unsecure
   - grpc_unsecure
   - gpr
@@ -5448,7 +5257,6 @@ targets:
   deps:
   - grpc++_test_util_unsecure
   - grpc_test_util_unsecure
-  - gpr_test_util
   - grpc++_unsecure
   - grpc_unsecure
   - gpr
@@ -5464,7 +5272,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   uses:
   - grpc++_test
@@ -5480,7 +5287,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - mac
@@ -5497,7 +5303,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: server_early_return_test
   gtest: true
@@ -5510,7 +5315,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: server_interceptors_end2end_test
   gtest: true
@@ -5527,7 +5331,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: server_request_call_test
   gtest: true
@@ -5540,7 +5343,6 @@ targets:
   deps:
   - grpc++_test_util_unsecure
   - grpc_test_util_unsecure
-  - gpr_test_util
   - grpc++_unsecure
   - grpc_unsecure
   - gpr
@@ -5555,7 +5357,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
 - name: slice_hash_table_test
   gtest: true
@@ -5566,7 +5367,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: slice_weak_hash_table_test
@@ -5578,7 +5378,6 @@ targets:
   deps:
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   uses_polling: false
 - name: stats_test
@@ -5591,7 +5390,6 @@ targets:
   - grpc++_test_util
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
   exclude_configs:
   - tsan
@@ -5627,7 +5425,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - mac
@@ -5657,7 +5454,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   - grpc++_test_config
 - name: thread_manager_test
@@ -5682,7 +5478,6 @@ targets:
   - grpc_test_util_unsecure
   - grpc++_unsecure
   - grpc_unsecure
-  - gpr_test_util
   - gpr
 - name: transport_pid_controller_test
   build: test
@@ -5694,7 +5489,6 @@ targets:
   - grpc++
   - grpc_test_util
   - grpc
-  - gpr_test_util
   - gpr
 - name: transport_security_common_api_test
   build: test
@@ -5717,7 +5511,6 @@ targets:
   - grpc_test_util
   - grpc++
   - grpc
-  - gpr_test_util
   - gpr
   platforms:
   - mac