From 1aaf170491952d3f7db97741cba0997c1c43590d Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 14 Apr 2022 21:41:23 +0800
Subject: [PATCH] enh(cluster): enable tsim to support valgrind startup

---
 tests/script/test.sh     | 4 ++--
 tests/tsim/inc/simInt.h  | 1 +
 tests/tsim/src/simExe.c  | 4 ++++
 tests/tsim/src/simMain.c | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/script/test.sh b/tests/script/test.sh
index 7721f21db7..f5a9e4187b 100755
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
@@ -125,8 +125,8 @@ ulimit -c unlimited
 if [ -n "$FILE_NAME" ]; then
   echo "------------------------------------------------------------------------"
   if [ $VALGRIND -eq 1 ]; then
-    echo valgrind --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes  --log-file=${CODE_DIR}/../script/valgrind.log $PROGRAM -c $CFG_DIR -f $FILE_NAME
-    valgrind --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes  --log-file=${CODE_DIR}/../script/valgrind.log $PROGRAM -c $CFG_DIR -f $FILE_NAME
+    echo valgrind --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes  --log-file=${CODE_DIR}/../script/valgrind.log $PROGRAM -c $CFG_DIR -f $FILE_NAME -v
+    valgrind --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes  --log-file=${CODE_DIR}/../script/valgrind.log $PROGRAM -c $CFG_DIR -f $FILE_NAME -v
   else
     if [[ $MULTIPROCESS -eq 1 ]];then
       echo "ExcuteCmd(multiprocess):" $PROGRAM -m -c $CFG_DIR -f $FILE_NAME  
diff --git a/tests/tsim/inc/simInt.h b/tests/tsim/inc/simInt.h
index a667139de1..c8b13736c7 100644
--- a/tests/tsim/inc/simInt.h
+++ b/tests/tsim/inc/simInt.h
@@ -156,6 +156,7 @@ extern int32_t  simDebugFlag;
 extern char     simScriptDir[];
 extern bool     abortExecution;
 extern bool     useMultiProcess;
+extern bool     useValgrind;
 
 SScript *simParseScript(char *fileName);
 SScript *simProcessCallOver(SScript *script);
diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
index d713233362..5a18084fff 100644
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -340,6 +340,10 @@ bool simExecuteSystemCmd(SScript *script, char *option) {
     simReplaceStr(buf, "deploy.sh", "deploy.sh -m");
   }
 
+  if (useValgrind) {
+    simReplaceStr(buf, "exec.sh", "exec.sh -v");
+  }
+
   simLogSql(buf, true);
   int32_t code = system(buf);
   int32_t repeatTimes = 0;
diff --git a/tests/tsim/src/simMain.c b/tests/tsim/src/simMain.c
index 8898f1b201..713e46df58 100644
--- a/tests/tsim/src/simMain.c
+++ b/tests/tsim/src/simMain.c
@@ -19,6 +19,7 @@
 bool simExecSuccess = false;
 bool abortExecution = false;
 bool useMultiProcess = false;
+bool useValgrind = false;
 
 void simHandleSignal(int32_t signo, void *sigInfo, void *context) {
   simSystemCleanUp();
@@ -35,6 +36,8 @@ int32_t main(int32_t argc, char *argv[]) {
       strcpy(scriptFile, argv[++i]);
     } else if (strcmp(argv[i], "-m") == 0) {
       useMultiProcess = true;
+    } else if (strcmp(argv[i], "-v") == 0) {
+      useValgrind = true;
     } else {
       printf("usage: %s [options] \n", argv[0]);
       printf("       [-c config]: config directory, default is: %s\n", configDir);
-- 
GitLab