Making the gRPC C tests building under Windows.

10 years ago · 2e3639302a
parent 7bf5092df0
commit 2e3639302a
39 changed files with 843 additions and 1161 deletions
--- a/614
+++ b/614
--- a/build.json
+++ b/build.json
@ -999,6 +999,9 @@
        "grpc",
        "gpr_test_util",
        "gpr"
+      ],
+      "platforms": [
+        "posix"
      ]
    },
    {
@ -1043,6 +1046,9 @@
        "grpc",
        "gpr_test_util",
        "gpr"
+      ],
+      "platforms": [
+        "posix"
      ]
    },
    {
@ -1057,6 +1063,9 @@
        "grpc",
        "gpr_test_util",
        "gpr"
+      ],
+      "platforms": [
+        "posix"
      ]
    },
    {
@ -1612,6 +1621,9 @@
        "grpc",
        "gpr_test_util",
        "gpr"
+      ],
+      "platforms": [
+        "posix"
      ]
    },
    {
@ -1668,6 +1680,9 @@
        "grpc",
        "gpr_test_util",
        "gpr"
+      ],
+      "platforms": [
+        "posix"
      ]
    },
    {
@ -1682,6 +1697,9 @@
        "grpc",
        "gpr_test_util",
        "gpr"
+      ],
+      "platforms": [
+        "posix"
      ]
    },
    {
@ -1696,6 +1714,9 @@
        "grpc",
        "gpr_test_util",
        "gpr"
+      ],
+      "platforms": [
+        "posix"
      ]
    },
    {
--- a/include/grpc/support/tls.h
+++ b/include/grpc/support/tls.h
@ -34,7 +34,7 @@
 #ifndef GRPC_SUPPORT_TLS_H
 #define GRPC_SUPPORT_TLS_H

-#include "port_platform.h"
+#include <grpc/support/port_platform.h>

 /* Thread local storage.

@ -63,15 +63,15 @@
   ALL functions here may be implemented as macros. */

 #ifdef GPR_GCC_TLS
-#include "tls_gcc.h"
+#include <grpc/support/tls_gcc.h>
 #endif

 #ifdef GPR_MSVC_TLS
-#include "tls_msvc.h"
+#include <grpc/support/tls_msvc.h>
 #endif

 #ifdef GPR_PTHREAD_TLS
-#include "tls_pthread.h"
+#include <grpc/support/tls_pthread.h>
 #endif

 #endif
--- a/include/grpc/support/tls_msvc.h
+++ b/include/grpc/support/tls_msvc.h
@ -42,7 +42,7 @@ struct gpr_msvc_thread_local {
 };

 #define GPR_TLS_DECL(name) \
-    static __thread struct gpr_msvc_thread_local name = {0}
+    static __declspec(thread) struct gpr_msvc_thread_local name = {0}

 #define gpr_tls_init(tls) do {} while (0)
 #define gpr_tls_destroy(tls) do {} while (0)
--- a/templates/vsprojects/Grpc.mak.template
+++ b/templates/vsprojects/Grpc.mak.template
@ -33,10 +33,19 @@
 <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
 <%
  disallowed_dependencies = set(['end2end_certs'])
-  buildable_targets = [ target for target in targets
-                        if not disallowed_dependencies.intersection(target.deps) and
+  build_from_project_file = set(['gpr',
+                                 'grpc',
+                                 'grpc_unsecure',
+                                 'gpr_test_util',
+                                 'grpc_test_util',
+                                 'grpc_test_util_unsecure',
+                                ])
+  buildable_targets = [ target for target in targets + libs
+                        if not disallowed_dependencies.intersection(target.get('deps', [])) and
+                        target.build in ['all', 'test', 'private', 'tool', 'benchmark'] and
+                        target.language in ['c', 'c++'] and
                        all([src.endswith('.c') for src in target.src]) and
-                        'windows' in target.platforms ]
+                        'windows' in target.get('platforms', ['windows']) ]
  c_test_targets = [ target for target in buildable_targets if target.build == 'test' and not target.language == 'c++' ]
  cxx_test_targets = [ target for target in buildable_targets if target.build == 'test' and target.language == 'c++' ]
 %>\
@ -45,31 +54,40 @@

 OUT_DIR=test_bin

-CC=cl.exe
-LINK=link.exe
+CC=cl.exe /nologo
+LINK=link.exe /nologo
+LIBTOOL=lib.exe /nologo /nodefaultlib

 REPO_ROOT=..
-OPENSSL_INCLUDES = .\packages\${get_openssl()}\build\native\include\v120\Win32\Debug\static
+OPENSSL_INCLUDES = .\packages\${get_openssl()}\build\native\include
 ZLIB_INCLUDES = .\packages\${get_zlib()}\build\native\include
 INCLUDES=/I$(REPO_ROOT) /I$(REPO_ROOT)\include /I$(OPENSSL_INCLUDES) /I$(ZLIB_INCLUDES)
 DEFINES=/D WIN32 /D _LIB /D _USE_32BIT_TIME_T /D _UNICODE /D UNICODE /D _CRT_SECURE_NO_WARNINGS
-CFLAGS=/c $(INCLUDES) /nologo /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze-
-LFLAGS=/DEBUG /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86
+CFLAGS=/c $(INCLUDES) /Z7 /W3 /WX- /sdl $(DEFINES) /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TC /analyze-
+LFLAGS=/DEBUG /INCREMENTAL /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /MACHINE:X86

 OPENSSL_LIBS=.\packages\${get_openssl()}\build\native\lib\v120\Win32\Debug\static\ssleay32.lib .\packages\${get_openssl()}\build\native\lib\v120\Win32\Debug\static\libeay32.lib
 WINSOCK_LIBS=ws2_32.lib
+GENERAL_LIBS=advapi32.lib comdlg32.lib gdi32.lib kernel32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib user32.lib uuid.lib winspool.lib
 ZLIB_LIBS=.\packages\${get_zlib()}\build\native\lib\v120\Win32\Debug\static\cdecl\zlib.lib
-LIBS=$(OPENSSL_LIBS) $(WINSOCK_LIBS) $(ZLIB_LIBS)
+LIBS=$(OPENSSL_LIBS) $(ZLIB_LIBS) $(GENERAL_LIBS) $(WINSOCK_LIBS)

-build_gpr_test_util:
-	msbuild grpc.sln /t:gpr_test_util /p:Configuration=Debug
-
-build_grpc_test_util:
-	msbuild grpc.sln /t:grpc_test_util /p:Configuration=Debug
+all: buildtests

 $(OUT_DIR):
 	mkdir $(OUT_DIR)

+build_libs: \
+% for target in buildable_targets:
+% if target.build == 'private' or target.build == 'all':
+% if target.name in build_from_project_file:
+build_${target.name} \
+% else:
+Debug\${target.name}.lib \
+% endif
+% endif
+% endfor
+
 buildtests: buildtests_c buildtests_cxx

 buildtests_c: \
@ -87,24 +105,42 @@ ${target.name}.exe \
 	echo All tests built.

 % for target in buildable_targets:
-${target.name}.exe: build_grpc_test_util $(OUT_DIR)
+%if target.name in build_from_project_file:
+build_${target.name}:
+	msbuild grpc.sln /t:${target.name} /p:Configuration=Debug /p:Linkage-grpc_dependencies_zlib=static
+%else:
+%if target.build == 'private':
+Debug\${target.name}.lib: \
+%else:
+${target.name}.exe: build_libs \
+%endif
+$(OUT_DIR)
 	echo Building ${target.name}
 	$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ \
 %for source in target.src:
 $(REPO_ROOT)\${to_windows_path(source)} \
 %endfor
+%if not target.src:
+$(REPO_ROOT)\${to_windows_path('vsprojects/dummy.c')} \
+%endif

+%if target.build == 'private':
+	$(LIBTOOL) /OUT:"Debug\${target.name}.lib" \
+%else:
 	$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\${target.name}.exe" \
-%for dep in target.deps:
+%for dep in target.get('deps', []):
 Debug\${dep}.lib \
 %endfor
 $(LIBS) \
+%endif
 %for source in target.src:
 $(OUT_DIR)\${re.search('([^/]+)\.c$', source).group(1)}.obj \
 %endfor

+%if target.build != 'private':
 ${target.name}: ${target.name}.exe
 	echo Running ${target.name}
 	$(OUT_DIR)\${target.name}.exe
-
+%endif
+%endif
 % endfor
--- a/test/core/end2end/fixtures/chttp2_fullstack_uds_posix.c
+++ b/test/core/end2end/fixtures/chttp2_fullstack_uds_posix.c
--- a/test/core/end2end/gen_build_json.py
+++ b/test/core/end2end/gen_build_json.py
@ -39,7 +39,7 @@ import simplejson
 END2END_FIXTURES = {
    'chttp2_fake_security': True,
    'chttp2_fullstack': False,
-    'chttp2_fullstack_uds': False,
+    'chttp2_fullstack_uds_posix': False,
    'chttp2_simple_ssl_fullstack': True,
    'chttp2_simple_ssl_with_oauth2_fullstack': True,
    'chttp2_socket_pair': False,
@ -87,7 +87,8 @@ def main():
              'build': 'private',
              'language': 'c',
              'secure': 'check' if END2END_FIXTURES[f] else 'no',
-              'src': ['test/core/end2end/fixtures/%s.c' % f]
+              'src': ['test/core/end2end/fixtures/%s.c' % f],
+              'platforms': [ 'posix' ] if f.endswith('_posix') else [ 'windows', 'posix' ],
          }
          for f in sorted(END2END_FIXTURES.keys())] + [
          {
@ -117,6 +118,7 @@ def main():
              'language': 'c',
              'src': [],
              'flaky': not END2END_TESTS[t],
+              'platforms': [ 'posix' ] if f.endswith('_posix') else [ 'windows', 'posix' ],
              'deps': [
                  'end2end_fixture_%s' % f,
                  'end2end_test_%s' % t,
@ -136,6 +138,7 @@ def main():
              'secure': 'no',
              'src': [],
              'flaky': 'invoke_large_request' in t,
+              'platforms': [ 'posix' ] if f.endswith('_posix') else [ 'windows', 'posix' ],
              'deps': [
                  'end2end_fixture_%s' % f,
                  'end2end_test_%s' % t,
--- a/test/core/end2end/tests/bad_hostname.c
+++ b/test/core/end2end/tests/bad_hostname.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include "src/core/support/string.h"
 #include <grpc/byte_buffer.h>
--- a/test/core/end2end/tests/cancel_after_accept.c
+++ b/test/core/end2end/tests/cancel_after_accept.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c
+++ b/test/core/end2end/tests/cancel_after_accept_and_writes_closed.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/cancel_after_invoke.c
+++ b/test/core/end2end/tests/cancel_after_invoke.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/cancel_before_invoke.c
+++ b/test/core/end2end/tests/cancel_before_invoke.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/cancel_in_a_vacuum.c
+++ b/test/core/end2end/tests/cancel_in_a_vacuum.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/census_simple_request.c
+++ b/test/core/end2end/tests/census_simple_request.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include "src/core/support/string.h"
 #include <grpc/byte_buffer.h>
--- a/test/core/end2end/tests/disappearing_server.c
+++ b/test/core/end2end/tests/disappearing_server.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c
+++ b/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/early_server_shutdown_finishes_tags.c
+++ b/test/core/end2end/tests/early_server_shutdown_finishes_tags.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/empty_batch.c
+++ b/test/core/end2end/tests/empty_batch.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include "src/core/support/string.h"
 #include <grpc/byte_buffer.h>
--- a/test/core/end2end/tests/graceful_server_shutdown.c
+++ b/test/core/end2end/tests/graceful_server_shutdown.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/invoke_large_request.c
+++ b/test/core/end2end/tests/invoke_large_request.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/max_concurrent_streams.c
+++ b/test/core/end2end/tests/max_concurrent_streams.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/max_message_length.c
+++ b/test/core/end2end/tests/max_message_length.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/no_op.c
+++ b/test/core/end2end/tests/no_op.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/ping_pong_streaming.c
+++ b/test/core/end2end/tests/ping_pong_streaming.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/registered_call.c
+++ b/test/core/end2end/tests/registered_call.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include "src/core/support/string.h"
 #include <grpc/byte_buffer.h>
--- a/test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c
+++ b/test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/request_response_with_metadata_and_payload.c
+++ b/test/core/end2end/tests/request_response_with_metadata_and_payload.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/request_response_with_payload.c
+++ b/test/core/end2end/tests/request_response_with_payload.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
+++ b/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/request_with_large_metadata.c
+++ b/test/core/end2end/tests/request_with_large_metadata.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/request_with_payload.c
+++ b/test/core/end2end/tests/request_with_payload.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/simple_delayed_request.c
+++ b/test/core/end2end/tests/simple_delayed_request.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include <grpc/byte_buffer.h>
 #include <grpc/support/alloc.h>
--- a/test/core/end2end/tests/simple_request.c
+++ b/test/core/end2end/tests/simple_request.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include "src/core/support/string.h"
 #include <grpc/byte_buffer.h>
--- a/test/core/end2end/tests/simple_request_with_high_initial_sequence_number.c
+++ b/test/core/end2end/tests/simple_request_with_high_initial_sequence_number.c
@ -35,7 +35,6 @@

 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include "src/core/support/string.h"
 #include <grpc/byte_buffer.h>
--- a/test/core/fling/server.c
+++ b/test/core/fling/server.c
@ -39,7 +39,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#ifndef _WIN32
+/* This is for _exit() below, which is temporary. */
 #include <unistd.h>
+#endif

 #include "test/core/util/grpc_profiler.h"
 #include "test/core/util/test_config.h"
@ -166,6 +169,8 @@ static void start_send_status(void) {
                                 tag(FLING_SERVER_SEND_STATUS_FOR_STREAMING)));
 }

+/* We have some sort of deadlock, so let's not exit gracefully for now.
+   When that is resolved, please remove the #include <unistd.h> above. */
 static void sigint_handler(int x) { _exit(0); }

 int main(int argc, char **argv) {
--- a/test/core/iomgr/sockaddr_utils_test.c
+++ b/test/core/iomgr/sockaddr_utils_test.c
@ -34,7 +34,6 @@
 #include "src/core/iomgr/sockaddr_utils.h"

 #include <errno.h>
-#include <netinet/in.h>
 #include <string.h>

 #include <grpc/support/alloc.h>
--- a/test/core/security/secure_endpoint_test.c
+++ b/test/core/security/secure_endpoint_test.c
@ -35,8 +35,6 @@

 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>

 #include "src/core/security/secure_endpoint.h"
 #include "src/core/iomgr/endpoint_pair.h"
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@ -158,7 +158,6 @@
    "language": "c", 
    "name": "fd_posix_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
@ -167,7 +166,6 @@
    "language": "c", 
    "name": "fling_stream_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
@ -176,7 +174,6 @@
    "language": "c", 
    "name": "fling_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
@ -482,7 +479,6 @@
    "language": "c", 
    "name": "poll_kick_posix_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
@ -518,7 +514,6 @@
    "language": "c", 
    "name": "tcp_client_posix_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
@ -527,7 +522,6 @@
    "language": "c", 
    "name": "tcp_posix_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
@ -536,7 +530,6 @@
    "language": "c", 
    "name": "tcp_server_posix_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
@ -1182,243 +1175,216 @@
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_bad_hostname_test", 
+    "name": "chttp2_fullstack_uds_posix_bad_hostname_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": true, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_cancel_after_accept_test", 
+    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_cancel_after_accept_and_writes_closed_test", 
+    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_and_writes_closed_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_cancel_after_invoke_test", 
+    "name": "chttp2_fullstack_uds_posix_cancel_after_invoke_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_cancel_before_invoke_test", 
+    "name": "chttp2_fullstack_uds_posix_cancel_before_invoke_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_cancel_in_a_vacuum_test", 
+    "name": "chttp2_fullstack_uds_posix_cancel_in_a_vacuum_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_census_simple_request_test", 
+    "name": "chttp2_fullstack_uds_posix_census_simple_request_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_disappearing_server_test", 
+    "name": "chttp2_fullstack_uds_posix_disappearing_server_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_early_server_shutdown_finishes_inflight_calls_test", 
+    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_inflight_calls_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_early_server_shutdown_finishes_tags_test", 
+    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_tags_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_empty_batch_test", 
+    "name": "chttp2_fullstack_uds_posix_empty_batch_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_graceful_server_shutdown_test", 
+    "name": "chttp2_fullstack_uds_posix_graceful_server_shutdown_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": true, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_invoke_large_request_test", 
+    "name": "chttp2_fullstack_uds_posix_invoke_large_request_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_max_concurrent_streams_test", 
+    "name": "chttp2_fullstack_uds_posix_max_concurrent_streams_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_max_message_length_test", 
+    "name": "chttp2_fullstack_uds_posix_max_message_length_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_no_op_test", 
+    "name": "chttp2_fullstack_uds_posix_no_op_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_ping_pong_streaming_test", 
+    "name": "chttp2_fullstack_uds_posix_ping_pong_streaming_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_registered_call_test", 
+    "name": "chttp2_fullstack_uds_posix_registered_call_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_response_with_binary_metadata_and_payload_test", 
+    "name": "chttp2_fullstack_uds_posix_request_response_with_binary_metadata_and_payload_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_response_with_metadata_and_payload_test", 
+    "name": "chttp2_fullstack_uds_posix_request_response_with_metadata_and_payload_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_response_with_payload_test", 
+    "name": "chttp2_fullstack_uds_posix_request_response_with_payload_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_response_with_trailing_metadata_and_payload_test", 
+    "name": "chttp2_fullstack_uds_posix_request_response_with_trailing_metadata_and_payload_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_with_large_metadata_test", 
+    "name": "chttp2_fullstack_uds_posix_request_with_large_metadata_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_with_payload_test", 
+    "name": "chttp2_fullstack_uds_posix_request_with_payload_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_simple_delayed_request_test", 
+    "name": "chttp2_fullstack_uds_posix_simple_delayed_request_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_simple_request_test", 
+    "name": "chttp2_fullstack_uds_posix_simple_request_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_simple_request_with_high_initial_sequence_number_test", 
+    "name": "chttp2_fullstack_uds_posix_simple_request_with_high_initial_sequence_number_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
@ -2640,243 +2606,216 @@
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_bad_hostname_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_bad_hostname_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_cancel_after_accept_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_cancel_after_accept_and_writes_closed_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_cancel_after_accept_and_writes_closed_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_cancel_after_invoke_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_cancel_after_invoke_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_cancel_before_invoke_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_cancel_before_invoke_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_cancel_in_a_vacuum_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_cancel_in_a_vacuum_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_census_simple_request_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_census_simple_request_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_disappearing_server_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_disappearing_server_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_inflight_calls_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_early_server_shutdown_finishes_tags_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_early_server_shutdown_finishes_tags_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_empty_batch_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_empty_batch_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_graceful_server_shutdown_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_graceful_server_shutdown_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": true, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_invoke_large_request_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_invoke_large_request_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_max_concurrent_streams_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_max_concurrent_streams_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_max_message_length_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_max_message_length_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_no_op_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_no_op_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_ping_pong_streaming_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_ping_pong_streaming_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_registered_call_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_registered_call_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_response_with_binary_metadata_and_payload_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_request_response_with_binary_metadata_and_payload_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_response_with_metadata_and_payload_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_request_response_with_metadata_and_payload_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_response_with_payload_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_request_response_with_payload_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_response_with_trailing_metadata_and_payload_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_request_response_with_trailing_metadata_and_payload_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_with_large_metadata_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_request_with_large_metadata_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_request_with_payload_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_request_with_payload_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_simple_delayed_request_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_simple_delayed_request_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_simple_request_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_simple_request_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
  {
    "flaky": false, 
    "language": "c", 
-    "name": "chttp2_fullstack_uds_simple_request_with_high_initial_sequence_number_unsecure_test", 
+    "name": "chttp2_fullstack_uds_posix_simple_request_with_high_initial_sequence_number_unsecure_test", 
    "platforms": [
-      "windows", 
      "posix"
    ]
  }, 
--- a/vsprojects/Grpc.mak
+++ b/vsprojects/Grpc.mak