diff options
| author |  Yang Gao <yangg@google.com> | 2015-08-19 21:49:10 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-08-19 21:49:10 -0700 |
| commit | 48c9f250c2577b70b89d3c2b0989c4a2f69c60ec (patch) | |
| tree | 2922125510e6ee21d316572713196a4db9236da4 /tools | |
| parent | 2262bf790096247556446aff1b3fd686f1a59ef2 (diff) | |
| parent | 681a291d12bb8fc7f8c238fdb674cd0f140294db (diff) | |
Merge pull request #2977 from ctiller/shutdown-c++
Add a deadline to Server::Shutdown
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 17 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 17 |
2 files changed, 34 insertions, 0 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 72e6c41508..50f078586d 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -1626,6 +1626,23 @@ "gpr_test_util", "grpc", "grpc++", + "grpc++_test_util", + "grpc_test_util", + "grpc_zookeeper" + ], + "headers": [], + "language": "c++", + "name": "shutdown_test", + "src": [ + "test/cpp/end2end/shutdown_test.cc" + ] + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc++", "grpc_test_util" ], "headers": [], diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index c25c0f3d7d..5f0452d76a 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -1434,6 +1434,23 @@ ], "flaky": false, "language": "c++", + "name": "shutdown_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "flaky": false, + "language": "c++", "name": "status_test", "platforms": [ "linux", |