From 3e0ff227195c4e20cd4cbeacf9b3361b3342c9db Mon Sep 17 00:00:00 2001
From: holmes1412 <holmesyxli@tencent.com>
Date: Thu, 23 Feb 2023 16:27:27 +0800
Subject: [PATCH] UnitTest: start a redis server if no local one; skip memory
 check if valgrind is not found;

---
 test/CMakeLists.txt    | 9 +++++----
 test/redis_unittest.cc | 7 +++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 17ffb783..62ac9de4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -71,7 +71,8 @@ foreach(src ${TEST_LIST})
 	add_dependencies(check ${src})
 endforeach()
 
-foreach(src ${TEST_LIST})
-	add_test(${src}-memory-check ${memcheck_command} ./${src})
-endforeach()
-
+if (NOT ${CMAKE_MEMORYCHECK_COMMAND} STREQUAL "CMAKE_MEMORYCHECK_COMMAND-NOTFOUND")
+	foreach(src ${TEST_LIST})
+		add_test(${src}-memory-check ${memcheck_command} ./${src})
+	endforeach()
+endif ()
diff --git a/test/redis_unittest.cc b/test/redis_unittest.cc
index b8bedf8b..3f790101 100644
--- a/test/redis_unittest.cc
+++ b/test/redis_unittest.cc
@@ -158,6 +158,11 @@ TEST(redis_unittest, WFRedisTask2)
 	std::mutex mutex;
 	std::condition_variable cond;
 	bool done = false;
+	bool server_started = false;
+
+	WFRedisServer server(__redis_process);
+	if (server.start("127.0.0.1", 6379) == 0)
+		server_started = true;
 
 	test_client("redis://127.0.0.1/6", mutex, cond, done);
 	std::unique_lock<std::mutex> lock(mutex);
@@ -165,5 +170,7 @@ TEST(redis_unittest, WFRedisTask2)
 		cond.wait(lock);
 
 	lock.unlock();
+	if (server_started)
+		server.stop();
 }