From ebc29bddd5cbc5cad23cc9b1095d842f55ece5e0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 6 Sep 2018 11:09:16 +0100
Subject: Try to prevent encode server test crashing in valgrind.

---
 src/lib/encode_server.cc | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/lib/encode_server.cc')

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index 26ef45d60..2603732c8 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -41,6 +41,9 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/foreach.hpp>
+#ifdef HAVE_VALGRIND_H
+#include <valgrind/memcheck.h>
+#endif
 #include <string>
 #include <vector>
 #include <iostream>
@@ -68,7 +71,11 @@ using dcp::Data;
 using dcp::raw_convert;
 
 EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
+#if !defined(RUNNING_ON_VALGRIND) || RUNNING_ON_VALGRIND == 0
 	: Server (ENCODE_FRAME_PORT)
+#else
+	: Server (ENCODE_FRAME_PORT, 2400)
+#endif
 	, _log (log)
 	, _verbose (verbose)
 	, _num_threads (num_threads)
-- 
cgit v1.2.3