diff options
author | David Garcia Quintas <dgq@google.com> | 2016-08-02 10:24:44 -0700 |
---|---|---|
committer | David Garcia Quintas <dgq@google.com> | 2016-08-02 10:24:44 -0700 |
commit | 1f32ae4e8419edccfad2609906d05a868f10d3de (patch) | |
tree | 55f4513420f80e48634108d4157d555fa2b1960f /test/cpp/end2end | |
parent | 8c5424f0d53c0ffea970dd0a985ef1639f398be9 (diff) | |
parent | fcccb5aca51c36841a229eba2884f7c67468143f (diff) |
Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse
Diffstat (limited to 'test/cpp/end2end')
-rw-r--r-- | test/cpp/end2end/server_builder_plugin_test.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/cpp/end2end/server_builder_plugin_test.cc b/test/cpp/end2end/server_builder_plugin_test.cc index 778a2be573..b967a5d1e9 100644 --- a/test/cpp/end2end/server_builder_plugin_test.cc +++ b/test/cpp/end2end/server_builder_plugin_test.cc @@ -191,7 +191,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> { // we run some tests without a service, and for those we need to supply a // frequently polled completion queue cq_ = builder_->AddCompletionQueue(); - cq_thread_ = grpc::thread(std::bind(&ServerBuilderPluginTest::RunCQ, this)); + cq_thread_ = new grpc::thread(&ServerBuilderPluginTest::RunCQ, this); server_ = builder_->BuildAndStart(); EXPECT_TRUE(CheckPresent()); } @@ -209,7 +209,8 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> { EXPECT_TRUE(plugin->finish_is_called()); server_->Shutdown(); cq_->Shutdown(); - cq_thread_.join(); + cq_thread_->join(); + delete cq_thread_; } string to_string(const int number) { @@ -224,7 +225,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> { std::unique_ptr<grpc::testing::EchoTestService::Stub> stub_; std::unique_ptr<ServerCompletionQueue> cq_; std::unique_ptr<Server> server_; - grpc::thread cq_thread_; + grpc::thread* cq_thread_; TestServiceImpl service_; int port_; |