From 96eb1cd7603544922c33f1e24ad3b992f22f6a2c Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Mon, 21 Dec 2020 20:50:46 +0000
Subject: [PATCH] ctest: add valgrind to some tests if platform has it
 available

---
 .../CMakeLists.txt                            | 20 ++++++++++++++++--
 .../minimal-secure-streams/CMakeLists.txt     | 21 +++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/minimal-examples/secure-streams/minimal-secure-streams-testsfail/CMakeLists.txt b/minimal-examples/secure-streams/minimal-secure-streams-testsfail/CMakeLists.txt
index 01de9e99a..909ec4e10 100644
--- a/minimal-examples/secure-streams/minimal-secure-streams-testsfail/CMakeLists.txt
+++ b/minimal-examples/secure-streams/minimal-secure-streams-testsfail/CMakeLists.txt
@@ -17,8 +17,17 @@ require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
 if (requirements)
 	add_executable(${SAMP} minimal-secure-streams-testsfail.c)
 
+	find_program(VALGRIND "valgrind")
+
 	if (LWS_CTEST_INTERNET_AVAILABLE AND NOT WIN32)
-		add_test(NAME ss-tf COMMAND lws-minimal-secure-streams-testsfail)
+		if (VALGRIND)
+			add_test(NAME ss-tf COMMAND
+				${VALGRIND} --tool=memcheck --leak-check=yes --num-callers=20
+				$<TARGET_FILE:lws-minimal-secure-streams-testsfail>)
+		else()
+			add_test(NAME ss-tf COMMAND lws-minimal-secure-streams-testsfail)
+		endif()
+
 		set_tests_properties(ss-tf
 				     PROPERTIES
 				     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples/secure-streams/minimal-secure-streams-testsfail
@@ -54,7 +63,14 @@ if (requirements)
 			# the client part that will connect to the proxy
 			#
 
-			add_test(NAME sspc-minimaltf COMMAND lws-minimal-secure-streams-testsfail-client -i +${CTEST_SOCKET_PATH})
+			if (VALGRIND)
+				add_test(NAME sspc-minimaltf COMMAND
+					${VALGRIND} --tool=memcheck --leak-check=yes --num-callers=20
+					$<TARGET_FILE:lws-minimal-secure-streams-testsfail-client> -i +${CTEST_SOCKET_PATH})
+			else()
+				add_test(NAME sspc-minimaltf COMMAND lws-minimal-secure-streams-testsfail-client -i +${CTEST_SOCKET_PATH})
+			endif()
+		
 			set_tests_properties(sspc-minimaltf PROPERTIES
 				WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples/secure-streams/minimal-secure-streams-testsfail
 				FIXTURES_REQUIRED "sstfproxy"
diff --git a/minimal-examples/secure-streams/minimal-secure-streams/CMakeLists.txt b/minimal-examples/secure-streams/minimal-secure-streams/CMakeLists.txt
index da3fc1497..7c6ed6cfb 100644
--- a/minimal-examples/secure-streams/minimal-secure-streams/CMakeLists.txt
+++ b/minimal-examples/secure-streams/minimal-secure-streams/CMakeLists.txt
@@ -17,8 +17,18 @@ require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
 if (requirements)
 	add_executable(${SAMP} minimal-secure-streams.c)
 
+	find_program(VALGRIND "valgrind")
+
 	if (LWS_CTEST_INTERNET_AVAILABLE AND NOT WIN32)
-		add_test(NAME ss-warmcat COMMAND lws-minimal-secure-streams)
+		if (VALGRIND)
+			message("testing via valgrind")
+			add_test(NAME ss-warmcat COMMAND
+				${VALGRIND} --tool=memcheck --leak-check=yes --num-callers=20
+				$<TARGET_FILE:lws-minimal-secure-streams>)
+		else()
+			add_test(NAME ss-warmcat COMMAND lws-minimal-secure-streams)
+		endif()
+
 		set_tests_properties(ss-warmcat
 				     PROPERTIES
 				     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples/secure-streams/minimal-secure-streams
@@ -54,7 +64,14 @@ if (requirements)
 			# the client part that will connect to the proxy
 			#
 
-			add_test(NAME sspc-minimal COMMAND lws-minimal-secure-streams-client -i +${CTEST_SOCKET_PATH})
+			if (VALGRIND)
+				message("testing via valgrind")
+				add_test(NAME sspc-minimal COMMAND
+					${VALGRIND} --tool=memcheck --leak-check=yes --num-callers=20
+					$<TARGET_FILE:lws-minimal-secure-streams> -i +${CTEST_SOCKET_PATH})
+			else()
+				add_test(NAME sspc-minimal COMMAND lws-minimal-secure-streams-client -i +${CTEST_SOCKET_PATH})
+			endif()
 			set_tests_properties(sspc-minimal PROPERTIES
 				WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples/secure-streams/minimal-secure-streams
 				FIXTURES_REQUIRED "ssproxy"