From 676751fcd38bee7a687bba027e2fd6eb44446dec Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 27 May 2017 00:00:29 +0100 Subject: [PATCH 1/1] Fix leaked threads in client-server test. --- test/client_server_test.cc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/client_server_test.cc b/test/client_server_test.cc index fab9411ab..f84a0cb58 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) EncodeServer* server = new EncodeServer (log, true, 2); - new thread (boost::bind (&EncodeServer::run, server)); + thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ dcpomatic_sleep (1); @@ -135,6 +135,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) delete *i; } + server_thread->join (); + delete server_thread; + delete server; } @@ -194,7 +197,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) EncodeServer* server = new EncodeServer (log, true, 2); - new thread (boost::bind (&EncodeServer::run, server)); + thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ dcpomatic_sleep (1); @@ -214,6 +217,9 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) delete *i; } + server_thread->join (); + delete server_thread; + delete server; } @@ -284,7 +290,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) EncodeServer* server = new EncodeServer (log, true, 2); - new thread (boost::bind (&EncodeServer::run, server)); + thread* server_thread = new thread (boost::bind (&EncodeServer::run, server)); /* Let the server get itself ready */ dcpomatic_sleep (1); @@ -304,5 +310,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_j2k) delete *i; } + server_thread->join (); + delete server_thread; + delete server; } -- 2.30.2