aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-07-16 16:26:19 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-07-16 16:26:19 -0700
commit9a3f858f9316cf8acca4aa964a35a784a93d7a17 (patch)
tree6befb4c93dfea87668d6ecb43b38e6b5f2b989ae /tools/run_tests
parente85483b39248b42512571ab7eb92c5fdff6304c3 (diff)
parenta2e1bb15772a62cd302f055c557eb04753c8966e (diff)
Merge pull request #2460 from vjpai/exposed_pool
Make thread_pool.h a public header
Diffstat (limited to 'tools/run_tests')
-rw-r--r--tools/run_tests/sources_and_headers.json46
-rw-r--r--tools/run_tests/tests.json18
2 files changed, 32 insertions, 32 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 8daee3c380..a757d31246 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -1204,6 +1204,21 @@
"gpr_test_util",
"grpc",
"grpc++",
+ "grpc_test_util"
+ ],
+ "headers": [],
+ "language": "c++",
+ "name": "fixed_size_thread_pool_test",
+ "src": [
+ "test/cpp/server/fixed_size_thread_pool_test.cc"
+ ]
+ },
+ {
+ "deps": [
+ "gpr",
+ "gpr_test_util",
+ "grpc",
+ "grpc++",
"grpc++_test_util",
"grpc_test_util"
],
@@ -1595,21 +1610,6 @@
"gpr_test_util",
"grpc",
"grpc++",
- "grpc_test_util"
- ],
- "headers": [],
- "language": "c++",
- "name": "thread_pool_test",
- "src": [
- "test/cpp/server/thread_pool_test.cc"
- ]
- },
- {
- "deps": [
- "gpr",
- "gpr_test_util",
- "grpc",
- "grpc++",
"grpc++_test_util",
"grpc_test_util"
],
@@ -9515,6 +9515,7 @@
"include/grpc++/config_protobuf.h",
"include/grpc++/create_channel.h",
"include/grpc++/credentials.h",
+ "include/grpc++/fixed_size_thread_pool.h",
"include/grpc++/generic_stub.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
@@ -9545,8 +9546,7 @@
"src/cpp/client/secure_credentials.h",
"src/cpp/common/create_auth_context.h",
"src/cpp/common/secure_auth_context.h",
- "src/cpp/server/secure_server_credentials.h",
- "src/cpp/server/thread_pool.h"
+ "src/cpp/server/secure_server_credentials.h"
],
"language": "c++",
"name": "grpc++",
@@ -9563,6 +9563,7 @@
"include/grpc++/config_protobuf.h",
"include/grpc++/create_channel.h",
"include/grpc++/credentials.h",
+ "include/grpc++/fixed_size_thread_pool.h",
"include/grpc++/generic_stub.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
@@ -9611,6 +9612,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/fixed_size_thread_pool.cc",
"src/cpp/server/insecure_server_credentials.cc",
"src/cpp/server/secure_server_credentials.cc",
"src/cpp/server/secure_server_credentials.h",
@@ -9618,8 +9620,6 @@
"src/cpp/server/server_builder.cc",
"src/cpp/server/server_context.cc",
"src/cpp/server/server_credentials.cc",
- "src/cpp/server/thread_pool.cc",
- "src/cpp/server/thread_pool.h",
"src/cpp/util/byte_buffer.cc",
"src/cpp/util/slice.cc",
"src/cpp/util/status.cc",
@@ -9686,6 +9686,7 @@
"include/grpc++/config_protobuf.h",
"include/grpc++/create_channel.h",
"include/grpc++/credentials.h",
+ "include/grpc++/fixed_size_thread_pool.h",
"include/grpc++/generic_stub.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
@@ -9713,8 +9714,7 @@
"include/grpc++/thread_pool_interface.h",
"include/grpc++/time.h",
"src/cpp/client/channel.h",
- "src/cpp/common/create_auth_context.h",
- "src/cpp/server/thread_pool.h"
+ "src/cpp/common/create_auth_context.h"
],
"language": "c++",
"name": "grpc++_unsecure",
@@ -9731,6 +9731,7 @@
"include/grpc++/config_protobuf.h",
"include/grpc++/create_channel.h",
"include/grpc++/credentials.h",
+ "include/grpc++/fixed_size_thread_pool.h",
"include/grpc++/generic_stub.h",
"include/grpc++/impl/call.h",
"include/grpc++/impl/client_unary_call.h",
@@ -9774,13 +9775,12 @@
"src/cpp/proto/proto_utils.cc",
"src/cpp/server/async_generic_service.cc",
"src/cpp/server/create_default_thread_pool.cc",
+ "src/cpp/server/fixed_size_thread_pool.cc",
"src/cpp/server/insecure_server_credentials.cc",
"src/cpp/server/server.cc",
"src/cpp/server/server_builder.cc",
"src/cpp/server/server_context.cc",
"src/cpp/server/server_credentials.cc",
- "src/cpp/server/thread_pool.cc",
- "src/cpp/server/thread_pool.h",
"src/cpp/util/byte_buffer.cc",
"src/cpp/util/slice.cc",
"src/cpp/util/status.cc",
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 3a22ba9180..8dfc5b94b3 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -687,6 +687,15 @@
{
"flaky": false,
"language": "c++",
+ "name": "fixed_size_thread_pool_test",
+ "platforms": [
+ "windows",
+ "posix"
+ ]
+ },
+ {
+ "flaky": false,
+ "language": "c++",
"name": "generic_end2end_test",
"platforms": [
"windows",
@@ -777,15 +786,6 @@
{
"flaky": false,
"language": "c++",
- "name": "thread_pool_test",
- "platforms": [
- "windows",
- "posix"
- ]
- },
- {
- "flaky": false,
- "language": "c++",
"name": "thread_stress_test",
"platforms": [
"windows",