Merge branch '3.0' into cpwu/3.0

tests/script/tmp/back.sim

+sql connect
+$x = 1
+begin:
+  sql insert into db.tb values(now, $x ) -x begin  
+  $x = $x + 1   
+goto begin

tests/script/tmp/data.sim

+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql create database db 
+sql create table db.tb (ts timestamp, i int)
+sql insert into db.tb values(now, 1)
+
+print ======== start back
+run_back tmp/back.sim
+
+sleep 2000
+return -1

tests/tsim/src/simSystem.c

@@ -80,24 +80,24 @@ SScript *simProcessCallOver(SScript *script) {
       simExecSuccess = false;
       simInfo("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX "failed" FAILED_POSTFIX ", error:%s",
               script->fileName, script->error);
-      return NULL;
     } else {
       simExecSuccess = true;
       simInfo("script:" SUCCESS_PREFIX "%s" SUCCESS_POSTFIX ", " SUCCESS_PREFIX "success" SUCCESS_POSTFIX,
               script->fileName);
-      simCloseTaosdConnect(script);
-      simScriptSucced++;
-      simScriptPos--;
-
-      simFreeScript(script);
-      if (simScriptPos == -1) {
-        simInfo("----------------------------------------------------------------------");
-        simInfo("Simulation Test Done, " SUCCESS_PREFIX "%d" SUCCESS_POSTFIX " Passed:\n", simScriptSucced);
-        return NULL;
-      }
+    }
 
-      return simScriptList[simScriptPos];
+    simCloseTaosdConnect(script);
+    simScriptSucced++;
+    simScriptPos--;
+    simFreeScript(script);
+
+    if (simScriptPos == -1 && simExecSuccess) {
+      simInfo("----------------------------------------------------------------------");
+      simInfo("Simulation Test Done, " SUCCESS_PREFIX "%d" SUCCESS_POSTFIX " Passed:\n", simScriptSucced);
+      return NULL;
     }
+
+    return simScriptList[simScriptPos];
   } else {
     simDebug("script:%s,  is stopped", script->fileName);
     simFreeScript(script);