diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 07:08:20 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 07:08:20 +0100 |
| commit | 78825caeeb61b048b32ee7076f61501b4dc01087 (patch) | |
| tree | 7fc9d41abbc69dfb8ea54ae31b0ce2f36be72249 /tools/run_tests/sources_and_headers.json | |
| parent | bf192eff5632213772ea3351f552722741d68e99 (diff) | |
| parent | 4fba286e4d013734aa3f1ddb7d0554e596b88a2c (diff) | |
Merge branch 'win32_subprocess' into make-ruby-installable
Conflicts:
BUILD
Makefile
binding.gyp
build.yaml
gRPC.podspec
grpc.gemspec
src/python/grpcio/grpc_core_dependencies.py
tools/run_tests/sources_and_headers.json
vsprojects/vcxproj/gpr/gpr.vcxproj
vsprojects/vcxproj/gpr/gpr.vcxproj.filters
Diffstat (limited to 'tools/run_tests/sources_and_headers.json')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index a3cfd04c7c..dceb495fc0 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -2929,6 +2929,7 @@ "src/core/support/string_win32.c", "src/core/support/string_win32.h", "src/core/support/subprocess_posix.c", + "src/core/support/subprocess_windows.c", "src/core/support/sync.c", "src/core/support/sync_posix.c", "src/core/support/sync_win32.c", @@ -3561,6 +3562,7 @@ "src/core/support/string_win32.c", "src/core/support/string_win32.h", "src/core/support/subprocess_posix.c", + "src/core/support/subprocess_windows.c", "src/core/support/sync.c", "src/core/support/sync_posix.c", "src/core/support/sync_win32.c", |