From 64d3b4aefebe0167b69d29b9710534feb1159749 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 5 Jan 2021 11:19:14 +0800
Subject: [PATCH] TD-2652 tsim may crash after the script is executed
 successfully

---
 tests/tsim/src/simExe.c    | 1 -
 tests/tsim/src/simMain.c   | 6 +++---
 tests/tsim/src/simSystem.c | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
index 2db750cdd3..00c9ecac5e 100644
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -448,7 +448,6 @@ void simCloseNativeConnect(SScript *script) {
 
   simDebug("script:%s, taos:%p closed", script->fileName, script->taos);
   taos_close(script->taos);
-  taosMsleep(1200);
 
   script->taos = NULL;
 }
diff --git a/tests/tsim/src/simMain.c b/tests/tsim/src/simMain.c
index 33fd24dd58..8f13254f68 100644
--- a/tests/tsim/src/simMain.c
+++ b/tests/tsim/src/simMain.c
@@ -40,14 +40,14 @@ int32_t main(int32_t argc, char *argv[]) {
       printf("usage: %s [options] \n", argv[0]);
       printf("       [-c config]: config directory, default is: %s\n", configDir);
       printf("       [-f script]: script filename\n");
-      exit(0);
+      return 0;
     }
   }
 
   if (!simSystemInit()) {
     simError("failed to initialize the system");
     simSystemCleanUp();
-    exit(1);
+    return -1;
   }
 
   simInfo("simulator is running ...");
@@ -56,7 +56,7 @@ int32_t main(int32_t argc, char *argv[]) {
   SScript *script = simParseScript(scriptFile);
   if (script == NULL) {
     simError("parse script file:%s failed", scriptFile);
-    exit(-1);
+    return -1;
   }
 
   simScriptList[++simScriptPos] = script;
diff --git a/tests/tsim/src/simSystem.c b/tests/tsim/src/simSystem.c
index 693ade7b35..db5fddacb8 100644
--- a/tests/tsim/src/simSystem.c
+++ b/tests/tsim/src/simSystem.c
@@ -113,7 +113,7 @@ SScript *simProcessCallOver(SScript *script) {
     if (script->killed) {
       simInfo("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX "failed" FAILED_POSTFIX ", error:%s",
               script->fileName, script->error);
-      exit(-1);
+      return NULL;
     } else {
       simInfo("script:" SUCCESS_PREFIX "%s" SUCCESS_POSTFIX ", " SUCCESS_PREFIX "success" SUCCESS_POSTFIX,
               script->fileName);
@@ -125,7 +125,7 @@ SScript *simProcessCallOver(SScript *script) {
       if (simScriptPos == -1) {
         simInfo("----------------------------------------------------------------------");
         simInfo("Simulation Test Done, " SUCCESS_PREFIX "%d" SUCCESS_POSTFIX " Passed:\n", simScriptSucced);
-        exit(0);
+        return NULL;
       }
 
       return simScriptList[simScriptPos];
-- 
GitLab