diff options
author | 2015-07-26 12:37:53 -0700 | |
---|---|---|
committer | 2015-07-26 12:37:53 -0700 | |
commit | dfc42da76011eec3270b3dbcc94748916e0aa5b2 (patch) | |
tree | 5e1a69afefaaee7457ed1fa5796d00c06957757e /build.json | |
parent | b256faa353159c0b6f3477777bed75b4f9de3e16 (diff) | |
parent | 5c575dd6e4b01cd68cca5d1917b58023dcf4ca0f (diff) |
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Conflicts:
src/core/iomgr/tcp_server_windows.c
Diffstat (limited to 'build.json')
-rw-r--r-- | build.json | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/build.json b/build.json index 37f2e32c42..943c5f2798 100644 --- a/build.json +++ b/build.json @@ -43,6 +43,7 @@ "include/grpc++/config_protobuf.h", "include/grpc++/create_channel.h", "include/grpc++/credentials.h", + "include/grpc++/dynamic_thread_pool.h", "include/grpc++/fixed_size_thread_pool.h", "include/grpc++/generic_stub.h", "include/grpc++/impl/call.h", @@ -90,6 +91,7 @@ "src/cpp/proto/proto_utils.cc", "src/cpp/server/async_generic_service.cc", "src/cpp/server/create_default_thread_pool.cc", + "src/cpp/server/dynamic_thread_pool.cc", "src/cpp/server/fixed_size_thread_pool.cc", "src/cpp/server/insecure_server_credentials.cc", "src/cpp/server/server.cc", @@ -612,7 +614,6 @@ "headers": [ "test/cpp/util/cli_call.h", "test/cpp/util/create_test_channel.h", - "test/cpp/util/fake_credentials.h", "test/cpp/util/subprocess.h" ], "src": [ @@ -621,7 +622,6 @@ "test/cpp/util/echo_duplicate.proto", "test/cpp/util/cli_call.cc", "test/cpp/util/create_test_channel.cc", - "test/cpp/util/fake_credentials.cc", "test/cpp/util/subprocess.cc" ], "deps": [ @@ -2048,6 +2048,21 @@ ] }, { + "name": "dynamic_thread_pool_test", + "build": "test", + "language": "c++", + "src": [ + "test/cpp/server/dynamic_thread_pool_test.cc" + ], + "deps": [ + "grpc_test_util", + "grpc++", + "grpc", + "gpr_test_util", + "gpr" + ] + }, + { "name": "end2end_test", "build": "test", "language": "c++", |