diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-24 23:24:44 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-24 23:24:44 +0200 |
| commit | fd2bf675f750f440d92bffeb88771e6d9253b498 (patch) | |
| tree | 340f8a6b8a5b181c215a90e038b17475a3206855 /test/cpp/client | |
| parent | 76e49fd80557c33595508686f3450982e63f0fce (diff) | |
| parent | 4107ba289747be6fba879e6060d40969f1aee89c (diff) | |
Merge branch 'master' of github.com:grpc/grpc into the-purge-2
Conflicts:
include/grpc++/completion_queue.h
Diffstat (limited to 'test/cpp/client')
| -rw-r--r-- | test/cpp/client/credentials_test.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc index d7ea09a5f1..6840418989 100644 --- a/test/cpp/client/credentials_test.cc +++ b/test/cpp/client/credentials_test.cc @@ -56,8 +56,6 @@ TEST_F(CredentialsTest, InvalidServiceAccountCreds) { int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); - grpc_init(); int ret = RUN_ALL_TESTS(); - grpc_shutdown(); return ret; } |