From: Carl Hetherington <cth@carlh.net>
Date: Fri, 26 May 2017 23:00:29 +0000 (+0100)
Subject: Fix leaked threads in client-server test.
X-Git-Tag: v2.11.9~14
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=676751fcd38bee7a687bba027e2fd6eb44446dec;hp=dd133fd1d81f943455cd8dd20cfb6018c63e673f;p=dcpomatic.git

Fix leaked threads in client-server test.
---

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;
 }