fixes to Grpc.mak

2 files changed, 91 insertions, 91 deletions

diff --git a/templates/vsprojects/Grpc.mak.template b/templates/vsprojects/Grpc.mak.template
index b761619d9b..95a28d0f98 100644
--- a/templates/vsprojects/Grpc.mak.template
+++ b/templates/vsprojects/Grpc.mak.template
@@ -61,11 +61,11 @@ WINSOCK_LIBS=ws2_32.lib
 ZLIB_LIBS=.\packages\${get_zlib()}\build\native\lib\v120\Win32\Debug\static\cdecl\zlib.lib
 LIBS=$(OPENSSL_LIBS) $(WINSOCK_LIBS) $(ZLIB_LIBS)
 
-gpr_test_util:
-	MSBuild.exe gpr_test_util\gpr_test_util.vcxproj /p:Configuration=Debug
+build_gpr_test_util:
+	msbuild grpc.sln /t:gpr_test_util /p:Configuration=Debug
 
-grpc_test_util:
-	MSBuild.exe grpc_test_util\grpc_test_util.vcxproj /p:Configuration=Debug
+build_grpc_test_util:
+	msbuild grpc.sln /t:grpc_test_util /p:Configuration=Debug
 
 $(OUT_DIR):
 	mkdir $(OUT_DIR)
@@ -87,7 +87,7 @@ ${target.name}.exe \
 	echo All tests built.
 
 % for target in buildable_targets:
-${target.name}.exe: grpc_test_util $(OUT_DIR)
+${target.name}.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building ${target.name}
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ \
 %for source in target.src:
diff --git a/vsprojects/Grpc.mak b/vsprojects/Grpc.mak
index 17d2ac5edf..6a2da915a4 100644
--- a/vsprojects/Grpc.mak
+++ b/vsprojects/Grpc.mak
@@ -47,11 +47,11 @@ WINSOCK_LIBS=ws2_32.lib
 ZLIB_LIBS=.\packages\grpc.dependencies.zlib.1.2.8.9\build\native\lib\v120\Win32\Debug\static\cdecl\zlib.lib
 LIBS=$(OPENSSL_LIBS) $(WINSOCK_LIBS) $(ZLIB_LIBS)
 
-gpr_test_util:
-	MSBuild.exe gpr_test_util\gpr_test_util.vcxproj /p:Configuration=Debug
+build_gpr_test_util:
+	msbuild grpc.sln /t:gpr_test_util /p:Configuration=Debug
 
-grpc_test_util:
-	MSBuild.exe grpc_test_util\grpc_test_util.vcxproj /p:Configuration=Debug
+build_grpc_test_util:
+	msbuild grpc.sln /t:grpc_test_util /p:Configuration=Debug
 
 $(OUT_DIR):
 	mkdir $(OUT_DIR)
@@ -64,7 +64,7 @@ buildtests_c: alarm_heap_test.exe alarm_list_test.exe alarm_test.exe alpn_test.e
 buildtests_cxx: 
 	echo All tests built.
 
-alarm_heap_test.exe: grpc_test_util $(OUT_DIR)
+alarm_heap_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building alarm_heap_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\alarm_heap_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\alarm_heap_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\alarm_heap_test.obj 
@@ -72,7 +72,7 @@ alarm_heap_test: alarm_heap_test.exe
 	echo Running alarm_heap_test
 	$(OUT_DIR)\alarm_heap_test.exe
 
-alarm_list_test.exe: grpc_test_util $(OUT_DIR)
+alarm_list_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building alarm_list_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\alarm_list_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\alarm_list_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\alarm_list_test.obj 
@@ -80,7 +80,7 @@ alarm_list_test: alarm_list_test.exe
 	echo Running alarm_list_test
 	$(OUT_DIR)\alarm_list_test.exe
 
-alarm_test.exe: grpc_test_util $(OUT_DIR)
+alarm_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building alarm_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\alarm_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\alarm_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\alarm_test.obj 
@@ -88,7 +88,7 @@ alarm_test: alarm_test.exe
 	echo Running alarm_test
 	$(OUT_DIR)\alarm_test.exe
 
-alpn_test.exe: grpc_test_util $(OUT_DIR)
+alpn_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building alpn_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\chttp2\alpn_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\alpn_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\alpn_test.obj 
@@ -96,7 +96,7 @@ alpn_test: alpn_test.exe
 	echo Running alpn_test
 	$(OUT_DIR)\alpn_test.exe
 
-bin_encoder_test.exe: grpc_test_util $(OUT_DIR)
+bin_encoder_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building bin_encoder_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\chttp2\bin_encoder_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\bin_encoder_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\bin_encoder_test.obj 
@@ -104,7 +104,7 @@ bin_encoder_test: bin_encoder_test.exe
 	echo Running bin_encoder_test
 	$(OUT_DIR)\bin_encoder_test.exe
 
-census_hash_table_test.exe: grpc_test_util $(OUT_DIR)
+census_hash_table_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building census_hash_table_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\statistics\hash_table_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\census_hash_table_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\hash_table_test.obj 
@@ -112,7 +112,7 @@ census_hash_table_test: census_hash_table_test.exe
 	echo Running census_hash_table_test
 	$(OUT_DIR)\census_hash_table_test.exe
 
-census_statistics_multiple_writers_circular_buffer_test.exe: grpc_test_util $(OUT_DIR)
+census_statistics_multiple_writers_circular_buffer_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building census_statistics_multiple_writers_circular_buffer_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\statistics\multiple_writers_circular_buffer_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\census_statistics_multiple_writers_circular_buffer_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\multiple_writers_circular_buffer_test.obj 
@@ -120,7 +120,7 @@ census_statistics_multiple_writers_circular_buffer_test: census_statistics_multi
 	echo Running census_statistics_multiple_writers_circular_buffer_test
 	$(OUT_DIR)\census_statistics_multiple_writers_circular_buffer_test.exe
 
-census_statistics_multiple_writers_test.exe: grpc_test_util $(OUT_DIR)
+census_statistics_multiple_writers_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building census_statistics_multiple_writers_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\statistics\multiple_writers_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\census_statistics_multiple_writers_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\multiple_writers_test.obj 
@@ -128,7 +128,7 @@ census_statistics_multiple_writers_test: census_statistics_multiple_writers_test
 	echo Running census_statistics_multiple_writers_test
 	$(OUT_DIR)\census_statistics_multiple_writers_test.exe
 
-census_statistics_performance_test.exe: grpc_test_util $(OUT_DIR)
+census_statistics_performance_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building census_statistics_performance_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\statistics\performance_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\census_statistics_performance_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\performance_test.obj 
@@ -136,7 +136,7 @@ census_statistics_performance_test: census_statistics_performance_test.exe
 	echo Running census_statistics_performance_test
 	$(OUT_DIR)\census_statistics_performance_test.exe
 
-census_statistics_quick_test.exe: grpc_test_util $(OUT_DIR)
+census_statistics_quick_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building census_statistics_quick_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\statistics\quick_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\census_statistics_quick_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\quick_test.obj 
@@ -144,7 +144,7 @@ census_statistics_quick_test: census_statistics_quick_test.exe
 	echo Running census_statistics_quick_test
 	$(OUT_DIR)\census_statistics_quick_test.exe
 
-census_statistics_small_log_test.exe: grpc_test_util $(OUT_DIR)
+census_statistics_small_log_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building census_statistics_small_log_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\statistics\small_log_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\census_statistics_small_log_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\small_log_test.obj 
@@ -152,7 +152,7 @@ census_statistics_small_log_test: census_statistics_small_log_test.exe
 	echo Running census_statistics_small_log_test
 	$(OUT_DIR)\census_statistics_small_log_test.exe
 
-census_stats_store_test.exe: grpc_test_util $(OUT_DIR)
+census_stats_store_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building census_stats_store_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\statistics\rpc_stats_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\census_stats_store_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\rpc_stats_test.obj 
@@ -160,7 +160,7 @@ census_stats_store_test: census_stats_store_test.exe
 	echo Running census_stats_store_test
 	$(OUT_DIR)\census_stats_store_test.exe
 
-census_stub_test.exe: grpc_test_util $(OUT_DIR)
+census_stub_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building census_stub_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\statistics\census_stub_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\census_stub_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\census_stub_test.obj 
@@ -168,7 +168,7 @@ census_stub_test: census_stub_test.exe
 	echo Running census_stub_test
 	$(OUT_DIR)\census_stub_test.exe
 
-census_trace_store_test.exe: grpc_test_util $(OUT_DIR)
+census_trace_store_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building census_trace_store_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\statistics\trace_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\census_trace_store_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\trace_test.obj 
@@ -176,7 +176,7 @@ census_trace_store_test: census_trace_store_test.exe
 	echo Running census_trace_store_test
 	$(OUT_DIR)\census_trace_store_test.exe
 
-census_window_stats_test.exe: grpc_test_util $(OUT_DIR)
+census_window_stats_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building census_window_stats_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\statistics\window_stats_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\census_window_stats_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\window_stats_test.obj 
@@ -184,7 +184,7 @@ census_window_stats_test: census_window_stats_test.exe
 	echo Running census_window_stats_test
 	$(OUT_DIR)\census_window_stats_test.exe
 
-chttp2_status_conversion_test.exe: grpc_test_util $(OUT_DIR)
+chttp2_status_conversion_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building chttp2_status_conversion_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\chttp2\status_conversion_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\chttp2_status_conversion_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\status_conversion_test.obj 
@@ -192,7 +192,7 @@ chttp2_status_conversion_test: chttp2_status_conversion_test.exe
 	echo Running chttp2_status_conversion_test
 	$(OUT_DIR)\chttp2_status_conversion_test.exe
 
-chttp2_stream_encoder_test.exe: grpc_test_util $(OUT_DIR)
+chttp2_stream_encoder_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building chttp2_stream_encoder_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\chttp2\stream_encoder_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\chttp2_stream_encoder_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\stream_encoder_test.obj 
@@ -200,7 +200,7 @@ chttp2_stream_encoder_test: chttp2_stream_encoder_test.exe
 	echo Running chttp2_stream_encoder_test
 	$(OUT_DIR)\chttp2_stream_encoder_test.exe
 
-chttp2_stream_map_test.exe: grpc_test_util $(OUT_DIR)
+chttp2_stream_map_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building chttp2_stream_map_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\chttp2\stream_map_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\chttp2_stream_map_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\stream_map_test.obj 
@@ -208,7 +208,7 @@ chttp2_stream_map_test: chttp2_stream_map_test.exe
 	echo Running chttp2_stream_map_test
 	$(OUT_DIR)\chttp2_stream_map_test.exe
 
-chttp2_transport_end2end_test.exe: grpc_test_util $(OUT_DIR)
+chttp2_transport_end2end_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building chttp2_transport_end2end_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\chttp2_transport_end2end_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\chttp2_transport_end2end_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\chttp2_transport_end2end_test.obj 
@@ -216,7 +216,7 @@ chttp2_transport_end2end_test: chttp2_transport_end2end_test.exe
 	echo Running chttp2_transport_end2end_test
 	$(OUT_DIR)\chttp2_transport_end2end_test.exe
 
-echo_client.exe: grpc_test_util $(OUT_DIR)
+echo_client.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building echo_client
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\echo\client.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\echo_client.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\client.obj 
@@ -224,7 +224,7 @@ echo_client: echo_client.exe
 	echo Running echo_client
 	$(OUT_DIR)\echo_client.exe
 
-echo_server.exe: grpc_test_util $(OUT_DIR)
+echo_server.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building echo_server
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\echo\server.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\echo_server.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\server.obj 
@@ -232,7 +232,7 @@ echo_server: echo_server.exe
 	echo Running echo_server
 	$(OUT_DIR)\echo_server.exe
 
-echo_test.exe: grpc_test_util $(OUT_DIR)
+echo_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building echo_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\echo\echo_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\echo_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\echo_test.obj 
@@ -240,7 +240,7 @@ echo_test: echo_test.exe
 	echo Running echo_test
 	$(OUT_DIR)\echo_test.exe
 
-fd_posix_test.exe: grpc_test_util $(OUT_DIR)
+fd_posix_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building fd_posix_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\fd_posix_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\fd_posix_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\fd_posix_test.obj 
@@ -248,7 +248,7 @@ fd_posix_test: fd_posix_test.exe
 	echo Running fd_posix_test
 	$(OUT_DIR)\fd_posix_test.exe
 
-fling_client.exe: grpc_test_util $(OUT_DIR)
+fling_client.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building fling_client
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\fling\client.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\fling_client.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\client.obj 
@@ -256,7 +256,7 @@ fling_client: fling_client.exe
 	echo Running fling_client
 	$(OUT_DIR)\fling_client.exe
 
-fling_server.exe: grpc_test_util $(OUT_DIR)
+fling_server.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building fling_server
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\fling\server.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\fling_server.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\server.obj 
@@ -264,7 +264,7 @@ fling_server: fling_server.exe
 	echo Running fling_server
 	$(OUT_DIR)\fling_server.exe
 
-fling_stream_test.exe: grpc_test_util $(OUT_DIR)
+fling_stream_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building fling_stream_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\fling\fling_stream_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\fling_stream_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\fling_stream_test.obj 
@@ -272,7 +272,7 @@ fling_stream_test: fling_stream_test.exe
 	echo Running fling_stream_test
 	$(OUT_DIR)\fling_stream_test.exe
 
-fling_test.exe: grpc_test_util $(OUT_DIR)
+fling_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building fling_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\fling\fling_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\fling_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\fling_test.obj 
@@ -280,7 +280,7 @@ fling_test: fling_test.exe
 	echo Running fling_test
 	$(OUT_DIR)\fling_test.exe
 
-gen_hpack_tables.exe: grpc_test_util $(OUT_DIR)
+gen_hpack_tables.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gen_hpack_tables
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\src\core\transport\chttp2\gen_hpack_tables.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gen_hpack_tables.exe" Debug\grpc_test_util.lib Debug\gpr.lib Debug\grpc.lib $(LIBS) $(OUT_DIR)\gen_hpack_tables.obj 
@@ -288,7 +288,7 @@ gen_hpack_tables: gen_hpack_tables.exe
 	echo Running gen_hpack_tables
 	$(OUT_DIR)\gen_hpack_tables.exe
 
-gpr_cancellable_test.exe: grpc_test_util $(OUT_DIR)
+gpr_cancellable_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_cancellable_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\cancellable_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_cancellable_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\cancellable_test.obj 
@@ -296,7 +296,7 @@ gpr_cancellable_test: gpr_cancellable_test.exe
 	echo Running gpr_cancellable_test
 	$(OUT_DIR)\gpr_cancellable_test.exe
 
-gpr_cmdline_test.exe: grpc_test_util $(OUT_DIR)
+gpr_cmdline_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_cmdline_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\cmdline_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_cmdline_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\cmdline_test.obj 
@@ -304,7 +304,7 @@ gpr_cmdline_test: gpr_cmdline_test.exe
 	echo Running gpr_cmdline_test
 	$(OUT_DIR)\gpr_cmdline_test.exe
 
-gpr_env_test.exe: grpc_test_util $(OUT_DIR)
+gpr_env_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_env_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\env_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_env_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\env_test.obj 
@@ -312,7 +312,7 @@ gpr_env_test: gpr_env_test.exe
 	echo Running gpr_env_test
 	$(OUT_DIR)\gpr_env_test.exe
 
-gpr_file_test.exe: grpc_test_util $(OUT_DIR)
+gpr_file_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_file_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\file_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_file_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\file_test.obj 
@@ -320,7 +320,7 @@ gpr_file_test: gpr_file_test.exe
 	echo Running gpr_file_test
 	$(OUT_DIR)\gpr_file_test.exe
 
-gpr_histogram_test.exe: grpc_test_util $(OUT_DIR)
+gpr_histogram_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_histogram_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\histogram_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_histogram_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\histogram_test.obj 
@@ -328,7 +328,7 @@ gpr_histogram_test: gpr_histogram_test.exe
 	echo Running gpr_histogram_test
 	$(OUT_DIR)\gpr_histogram_test.exe
 
-gpr_host_port_test.exe: grpc_test_util $(OUT_DIR)
+gpr_host_port_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_host_port_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\host_port_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_host_port_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\host_port_test.obj 
@@ -336,7 +336,7 @@ gpr_host_port_test: gpr_host_port_test.exe
 	echo Running gpr_host_port_test
 	$(OUT_DIR)\gpr_host_port_test.exe
 
-gpr_log_test.exe: grpc_test_util $(OUT_DIR)
+gpr_log_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_log_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\log_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_log_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\log_test.obj 
@@ -344,7 +344,7 @@ gpr_log_test: gpr_log_test.exe
 	echo Running gpr_log_test
 	$(OUT_DIR)\gpr_log_test.exe
 
-gpr_slice_buffer_test.exe: grpc_test_util $(OUT_DIR)
+gpr_slice_buffer_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_slice_buffer_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\slice_buffer_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_slice_buffer_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\slice_buffer_test.obj 
@@ -352,7 +352,7 @@ gpr_slice_buffer_test: gpr_slice_buffer_test.exe
 	echo Running gpr_slice_buffer_test
 	$(OUT_DIR)\gpr_slice_buffer_test.exe
 
-gpr_slice_test.exe: grpc_test_util $(OUT_DIR)
+gpr_slice_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_slice_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\slice_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_slice_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\slice_test.obj 
@@ -360,7 +360,7 @@ gpr_slice_test: gpr_slice_test.exe
 	echo Running gpr_slice_test
 	$(OUT_DIR)\gpr_slice_test.exe
 
-gpr_string_test.exe: grpc_test_util $(OUT_DIR)
+gpr_string_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_string_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\string_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_string_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\string_test.obj 
@@ -368,7 +368,7 @@ gpr_string_test: gpr_string_test.exe
 	echo Running gpr_string_test
 	$(OUT_DIR)\gpr_string_test.exe
 
-gpr_sync_test.exe: grpc_test_util $(OUT_DIR)
+gpr_sync_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_sync_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\sync_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_sync_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\sync_test.obj 
@@ -376,7 +376,7 @@ gpr_sync_test: gpr_sync_test.exe
 	echo Running gpr_sync_test
 	$(OUT_DIR)\gpr_sync_test.exe
 
-gpr_thd_test.exe: grpc_test_util $(OUT_DIR)
+gpr_thd_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_thd_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\thd_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_thd_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\thd_test.obj 
@@ -384,7 +384,7 @@ gpr_thd_test: gpr_thd_test.exe
 	echo Running gpr_thd_test
 	$(OUT_DIR)\gpr_thd_test.exe
 
-gpr_time_test.exe: grpc_test_util $(OUT_DIR)
+gpr_time_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_time_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\time_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_time_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\time_test.obj 
@@ -392,7 +392,7 @@ gpr_time_test: gpr_time_test.exe
 	echo Running gpr_time_test
 	$(OUT_DIR)\gpr_time_test.exe
 
-gpr_tls_test.exe: grpc_test_util $(OUT_DIR)
+gpr_tls_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_tls_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\tls_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_tls_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\tls_test.obj 
@@ -400,7 +400,7 @@ gpr_tls_test: gpr_tls_test.exe
 	echo Running gpr_tls_test
 	$(OUT_DIR)\gpr_tls_test.exe
 
-gpr_useful_test.exe: grpc_test_util $(OUT_DIR)
+gpr_useful_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building gpr_useful_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\useful_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gpr_useful_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\useful_test.obj 
@@ -408,7 +408,7 @@ gpr_useful_test: gpr_useful_test.exe
 	echo Running gpr_useful_test
 	$(OUT_DIR)\gpr_useful_test.exe
 
-grpc_base64_test.exe: grpc_test_util $(OUT_DIR)
+grpc_base64_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_base64_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\security\base64_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_base64_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\base64_test.obj 
@@ -416,7 +416,7 @@ grpc_base64_test: grpc_base64_test.exe
 	echo Running grpc_base64_test
 	$(OUT_DIR)\grpc_base64_test.exe
 
-grpc_byte_buffer_reader_test.exe: grpc_test_util $(OUT_DIR)
+grpc_byte_buffer_reader_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_byte_buffer_reader_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\surface\byte_buffer_reader_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_byte_buffer_reader_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\byte_buffer_reader_test.obj 
@@ -424,7 +424,7 @@ grpc_byte_buffer_reader_test: grpc_byte_buffer_reader_test.exe
 	echo Running grpc_byte_buffer_reader_test
 	$(OUT_DIR)\grpc_byte_buffer_reader_test.exe
 
-grpc_channel_stack_test.exe: grpc_test_util $(OUT_DIR)
+grpc_channel_stack_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_channel_stack_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\channel\channel_stack_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_channel_stack_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\channel_stack_test.obj 
@@ -432,7 +432,7 @@ grpc_channel_stack_test: grpc_channel_stack_test.exe
 	echo Running grpc_channel_stack_test
 	$(OUT_DIR)\grpc_channel_stack_test.exe
 
-grpc_completion_queue_benchmark.exe: grpc_test_util $(OUT_DIR)
+grpc_completion_queue_benchmark.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_completion_queue_benchmark
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\surface\completion_queue_benchmark.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_completion_queue_benchmark.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\completion_queue_benchmark.obj 
@@ -440,7 +440,7 @@ grpc_completion_queue_benchmark: grpc_completion_queue_benchmark.exe
 	echo Running grpc_completion_queue_benchmark
 	$(OUT_DIR)\grpc_completion_queue_benchmark.exe
 
-grpc_completion_queue_test.exe: grpc_test_util $(OUT_DIR)
+grpc_completion_queue_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_completion_queue_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\surface\completion_queue_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_completion_queue_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\completion_queue_test.obj 
@@ -448,7 +448,7 @@ grpc_completion_queue_test: grpc_completion_queue_test.exe
 	echo Running grpc_completion_queue_test
 	$(OUT_DIR)\grpc_completion_queue_test.exe
 
-grpc_create_jwt.exe: grpc_test_util $(OUT_DIR)
+grpc_create_jwt.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_create_jwt
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\security\create_jwt.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_create_jwt.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\create_jwt.obj 
@@ -456,7 +456,7 @@ grpc_create_jwt: grpc_create_jwt.exe
 	echo Running grpc_create_jwt
 	$(OUT_DIR)\grpc_create_jwt.exe
 
-grpc_credentials_test.exe: grpc_test_util $(OUT_DIR)
+grpc_credentials_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_credentials_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\security\credentials_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_credentials_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\credentials_test.obj 
@@ -464,7 +464,7 @@ grpc_credentials_test: grpc_credentials_test.exe
 	echo Running grpc_credentials_test
 	$(OUT_DIR)\grpc_credentials_test.exe
 
-grpc_fetch_oauth2.exe: grpc_test_util $(OUT_DIR)
+grpc_fetch_oauth2.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_fetch_oauth2
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\security\fetch_oauth2.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_fetch_oauth2.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\fetch_oauth2.obj 
@@ -472,7 +472,7 @@ grpc_fetch_oauth2: grpc_fetch_oauth2.exe
 	echo Running grpc_fetch_oauth2
 	$(OUT_DIR)\grpc_fetch_oauth2.exe
 
-grpc_json_token_test.exe: grpc_test_util $(OUT_DIR)
+grpc_json_token_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_json_token_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\security\json_token_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_json_token_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\json_token_test.obj 
@@ -480,7 +480,7 @@ grpc_json_token_test: grpc_json_token_test.exe
 	echo Running grpc_json_token_test
 	$(OUT_DIR)\grpc_json_token_test.exe
 
-grpc_print_google_default_creds_token.exe: grpc_test_util $(OUT_DIR)
+grpc_print_google_default_creds_token.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_print_google_default_creds_token
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\security\print_google_default_creds_token.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_print_google_default_creds_token.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\print_google_default_creds_token.obj 
@@ -488,7 +488,7 @@ grpc_print_google_default_creds_token: grpc_print_google_default_creds_token.exe
 	echo Running grpc_print_google_default_creds_token
 	$(OUT_DIR)\grpc_print_google_default_creds_token.exe
 
-grpc_stream_op_test.exe: grpc_test_util $(OUT_DIR)
+grpc_stream_op_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building grpc_stream_op_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\stream_op_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\grpc_stream_op_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\stream_op_test.obj 
@@ -496,7 +496,7 @@ grpc_stream_op_test: grpc_stream_op_test.exe
 	echo Running grpc_stream_op_test
 	$(OUT_DIR)\grpc_stream_op_test.exe
 
-hpack_parser_test.exe: grpc_test_util $(OUT_DIR)
+hpack_parser_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building hpack_parser_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\chttp2\hpack_parser_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\hpack_parser_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\hpack_parser_test.obj 
@@ -504,7 +504,7 @@ hpack_parser_test: hpack_parser_test.exe
 	echo Running hpack_parser_test
 	$(OUT_DIR)\hpack_parser_test.exe
 
-hpack_table_test.exe: grpc_test_util $(OUT_DIR)
+hpack_table_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building hpack_table_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\chttp2\hpack_table_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\hpack_table_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\hpack_table_test.obj 
@@ -512,7 +512,7 @@ hpack_table_test: hpack_table_test.exe
 	echo Running hpack_table_test
 	$(OUT_DIR)\hpack_table_test.exe
 
-httpcli_format_request_test.exe: grpc_test_util $(OUT_DIR)
+httpcli_format_request_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building httpcli_format_request_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\httpcli\format_request_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\httpcli_format_request_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\format_request_test.obj 
@@ -520,7 +520,7 @@ httpcli_format_request_test: httpcli_format_request_test.exe
 	echo Running httpcli_format_request_test
 	$(OUT_DIR)\httpcli_format_request_test.exe
 
-httpcli_parser_test.exe: grpc_test_util $(OUT_DIR)
+httpcli_parser_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building httpcli_parser_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\httpcli\parser_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\httpcli_parser_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\parser_test.obj 
@@ -528,7 +528,7 @@ httpcli_parser_test: httpcli_parser_test.exe
 	echo Running httpcli_parser_test
 	$(OUT_DIR)\httpcli_parser_test.exe
 
-httpcli_test.exe: grpc_test_util $(OUT_DIR)
+httpcli_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building httpcli_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\httpcli\httpcli_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\httpcli_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\httpcli_test.obj 
@@ -536,7 +536,7 @@ httpcli_test: httpcli_test.exe
 	echo Running httpcli_test
 	$(OUT_DIR)\httpcli_test.exe
 
-json_rewrite.exe: grpc_test_util $(OUT_DIR)
+json_rewrite.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building json_rewrite
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\json\json_rewrite.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\json_rewrite.exe" Debug\grpc.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\json_rewrite.obj 
@@ -544,7 +544,7 @@ json_rewrite: json_rewrite.exe
 	echo Running json_rewrite
 	$(OUT_DIR)\json_rewrite.exe
 
-json_rewrite_test.exe: grpc_test_util $(OUT_DIR)
+json_rewrite_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building json_rewrite_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\json\json_rewrite_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\json_rewrite_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\json_rewrite_test.obj 
@@ -552,7 +552,7 @@ json_rewrite_test: json_rewrite_test.exe
 	echo Running json_rewrite_test
 	$(OUT_DIR)\json_rewrite_test.exe
 
-json_test.exe: grpc_test_util $(OUT_DIR)
+json_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building json_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\json\json_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\json_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\json_test.obj 
@@ -560,7 +560,7 @@ json_test: json_test.exe
 	echo Running json_test
 	$(OUT_DIR)\json_test.exe
 
-lame_client_test.exe: grpc_test_util $(OUT_DIR)
+lame_client_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building lame_client_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\surface\lame_client_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\lame_client_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\lame_client_test.obj 
@@ -568,7 +568,7 @@ lame_client_test: lame_client_test.exe
 	echo Running lame_client_test
 	$(OUT_DIR)\lame_client_test.exe
 
-low_level_ping_pong_benchmark.exe: grpc_test_util $(OUT_DIR)
+low_level_ping_pong_benchmark.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building low_level_ping_pong_benchmark
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\network_benchmarks\low_level_ping_pong.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\low_level_ping_pong_benchmark.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\low_level_ping_pong.obj 
@@ -576,7 +576,7 @@ low_level_ping_pong_benchmark: low_level_ping_pong_benchmark.exe
 	echo Running low_level_ping_pong_benchmark
 	$(OUT_DIR)\low_level_ping_pong_benchmark.exe
 
-message_compress_test.exe: grpc_test_util $(OUT_DIR)
+message_compress_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building message_compress_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\compression\message_compress_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\message_compress_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\message_compress_test.obj 
@@ -584,7 +584,7 @@ message_compress_test: message_compress_test.exe
 	echo Running message_compress_test
 	$(OUT_DIR)\message_compress_test.exe
 
-metadata_buffer_test.exe: grpc_test_util $(OUT_DIR)
+metadata_buffer_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building metadata_buffer_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\channel\metadata_buffer_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\metadata_buffer_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\metadata_buffer_test.obj 
@@ -592,7 +592,7 @@ metadata_buffer_test: metadata_buffer_test.exe
 	echo Running metadata_buffer_test
 	$(OUT_DIR)\metadata_buffer_test.exe
 
-multi_init_test.exe: grpc_test_util $(OUT_DIR)
+multi_init_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building multi_init_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\surface\multi_init_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\multi_init_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\multi_init_test.obj 
@@ -600,7 +600,7 @@ multi_init_test: multi_init_test.exe
 	echo Running multi_init_test
 	$(OUT_DIR)\multi_init_test.exe
 
-murmur_hash_test.exe: grpc_test_util $(OUT_DIR)
+murmur_hash_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building murmur_hash_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\murmur_hash_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\murmur_hash_test.exe" Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\murmur_hash_test.obj 
@@ -608,7 +608,7 @@ murmur_hash_test: murmur_hash_test.exe
 	echo Running murmur_hash_test
 	$(OUT_DIR)\murmur_hash_test.exe
 
-no_server_test.exe: grpc_test_util $(OUT_DIR)
+no_server_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building no_server_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\end2end\no_server_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\no_server_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\no_server_test.obj 
@@ -616,7 +616,7 @@ no_server_test: no_server_test.exe
 	echo Running no_server_test
 	$(OUT_DIR)\no_server_test.exe
 
-poll_kick_posix_test.exe: grpc_test_util $(OUT_DIR)
+poll_kick_posix_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building poll_kick_posix_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\poll_kick_posix_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\poll_kick_posix_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\poll_kick_posix_test.obj 
@@ -624,7 +624,7 @@ poll_kick_posix_test: poll_kick_posix_test.exe
 	echo Running poll_kick_posix_test
 	$(OUT_DIR)\poll_kick_posix_test.exe
 
-resolve_address_test.exe: grpc_test_util $(OUT_DIR)
+resolve_address_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building resolve_address_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\resolve_address_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\resolve_address_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\resolve_address_test.obj 
@@ -632,7 +632,7 @@ resolve_address_test: resolve_address_test.exe
 	echo Running resolve_address_test
 	$(OUT_DIR)\resolve_address_test.exe
 
-secure_endpoint_test.exe: grpc_test_util $(OUT_DIR)
+secure_endpoint_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building secure_endpoint_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\security\secure_endpoint_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\secure_endpoint_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\secure_endpoint_test.obj 
@@ -640,7 +640,7 @@ secure_endpoint_test: secure_endpoint_test.exe
 	echo Running secure_endpoint_test
 	$(OUT_DIR)\secure_endpoint_test.exe
 
-sockaddr_utils_test.exe: grpc_test_util $(OUT_DIR)
+sockaddr_utils_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building sockaddr_utils_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\sockaddr_utils_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\sockaddr_utils_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\sockaddr_utils_test.obj 
@@ -648,7 +648,7 @@ sockaddr_utils_test: sockaddr_utils_test.exe
 	echo Running sockaddr_utils_test
 	$(OUT_DIR)\sockaddr_utils_test.exe
 
-tcp_client_posix_test.exe: grpc_test_util $(OUT_DIR)
+tcp_client_posix_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building tcp_client_posix_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\tcp_client_posix_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\tcp_client_posix_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\tcp_client_posix_test.obj 
@@ -656,7 +656,7 @@ tcp_client_posix_test: tcp_client_posix_test.exe
 	echo Running tcp_client_posix_test
 	$(OUT_DIR)\tcp_client_posix_test.exe
 
-tcp_posix_test.exe: grpc_test_util $(OUT_DIR)
+tcp_posix_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building tcp_posix_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\tcp_posix_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\tcp_posix_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\tcp_posix_test.obj 
@@ -664,7 +664,7 @@ tcp_posix_test: tcp_posix_test.exe
 	echo Running tcp_posix_test
 	$(OUT_DIR)\tcp_posix_test.exe
 
-tcp_server_posix_test.exe: grpc_test_util $(OUT_DIR)
+tcp_server_posix_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building tcp_server_posix_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\tcp_server_posix_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\tcp_server_posix_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\tcp_server_posix_test.obj 
@@ -672,7 +672,7 @@ tcp_server_posix_test: tcp_server_posix_test.exe
 	echo Running tcp_server_posix_test
 	$(OUT_DIR)\tcp_server_posix_test.exe
 
-time_averaged_stats_test.exe: grpc_test_util $(OUT_DIR)
+time_averaged_stats_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building time_averaged_stats_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\iomgr\time_averaged_stats_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\time_averaged_stats_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\time_averaged_stats_test.obj 
@@ -680,7 +680,7 @@ time_averaged_stats_test: time_averaged_stats_test.exe
 	echo Running time_averaged_stats_test
 	$(OUT_DIR)\time_averaged_stats_test.exe
 
-time_test.exe: grpc_test_util $(OUT_DIR)
+time_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building time_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\support\time_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\time_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\time_test.obj 
@@ -688,7 +688,7 @@ time_test: time_test.exe
 	echo Running time_test
 	$(OUT_DIR)\time_test.exe
 
-timeout_encoding_test.exe: grpc_test_util $(OUT_DIR)
+timeout_encoding_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building timeout_encoding_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\chttp2\timeout_encoding_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\timeout_encoding_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\timeout_encoding_test.obj 
@@ -696,7 +696,7 @@ timeout_encoding_test: timeout_encoding_test.exe
 	echo Running timeout_encoding_test
 	$(OUT_DIR)\timeout_encoding_test.exe
 
-timers_test.exe: grpc_test_util $(OUT_DIR)
+timers_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building timers_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\profiling\timers_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\timers_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\timers_test.obj 
@@ -704,7 +704,7 @@ timers_test: timers_test.exe
 	echo Running timers_test
 	$(OUT_DIR)\timers_test.exe
 
-transport_metadata_test.exe: grpc_test_util $(OUT_DIR)
+transport_metadata_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building transport_metadata_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\transport\metadata_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\transport_metadata_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\metadata_test.obj 
@@ -712,7 +712,7 @@ transport_metadata_test: transport_metadata_test.exe
 	echo Running transport_metadata_test
 	$(OUT_DIR)\transport_metadata_test.exe
 
-transport_security_test.exe: grpc_test_util $(OUT_DIR)
+transport_security_test.exe: build_grpc_test_util $(OUT_DIR)
 	echo Building transport_security_test
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\test\core\tsi\transport_security_test.c 
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\transport_security_test.exe" Debug\grpc_test_util.lib Debug\grpc.lib Debug\gpr_test_util.lib Debug\gpr.lib $(LIBS) $(OUT_DIR)\transport_security_test.obj