From e98b8355c3ce1cebe63c8770c650560dc50b24cd Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Fri, 16 Jul 2021 19:56:23 +0800
Subject: [PATCH] [TD-5352]<fix>: Unable to run tsim test script on MacOS

---
 tests/script/sh/cfg.sh                 | 18 ++++++++++----
 tests/script/sh/clear.sh               | 22 +++++++++++------
 tests/script/sh/deploy.sh              | 18 ++++++++++----
 tests/script/sh/exec-default.sh        | 16 +++++++++---
 tests/script/sh/exec-no-random-fail.sh | 34 ++++++++++++++++----------
 tests/script/sh/exec-random-fail.sh    | 16 +++++++++---
 tests/script/sh/exec.sh                | 17 ++++++++++---
 tests/script/sh/exec_tarbitrator.sh    | 16 +++++++++---
 tests/script/sh/move_dnode.sh          | 15 +++++++++---
 tests/script/sh/mv_old_data.sh         | 15 +++++++++---
 tests/script/sh/stop_dnodes.sh         | 32 ++++++++++++++++--------
 tests/script/test.sh                   | 18 ++++++++++----
 12 files changed, 170 insertions(+), 67 deletions(-)

diff --git a/tests/script/sh/cfg.sh b/tests/script/sh/cfg.sh
index 0c28a8edce..7d4d747e54 100755
--- a/tests/script/sh/cfg.sh
+++ b/tests/script/sh/cfg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ $# != 6 ]; then 
+if [ $# != 6 ]; then
   echo "argument list need input : "
   echo "  -n nodeName"
   echo "  -c configName"
@@ -8,10 +8,12 @@ if [ $# != 6 ]; then
   exit 1
 fi
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
 NODE_NAME=
 CONFIG_NAME=
 CONFIG_VALUE=
-while getopts "n:v:c:" arg 
+while getopts "n:v:c:" arg
 do
   case $arg in
     n)
@@ -43,10 +45,16 @@ fi
 TAOS_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
@@ -56,7 +64,7 @@ SIM_DIR=$TAOS_DIR/sim
 NODE_DIR=$SIM_DIR/$NODE_NAME
 TAOS_CFG=$NODE_DIR/cfg/taos.cfg
 TAOS_FLAG=$SIM_DIR/tsim/flag
-if [ -f "$TAOS_FLAG" ] ; then 
+if [ -f "$TAOS_FLAG" ] ; then
   TAOS_CFG=/etc/taos/taos.cfg
 fi
 
diff --git a/tests/script/sh/clear.sh b/tests/script/sh/clear.sh
index 0238ceec5d..4ee296cf05 100755
--- a/tests/script/sh/clear.sh
+++ b/tests/script/sh/clear.sh
@@ -2,7 +2,7 @@
 
 echo "Executing clear.sh"
 
-if [ $# != 6 ]; then 
+if [ $# != 6 ]; then
   echo "argument list need input : "
   echo "  -n nodeName"
   echo "  -i nodeIp"
@@ -10,10 +10,12 @@ if [ $# != 6 ]; then
   exit 1
 fi
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
 NODE_NAME=
 NODE_IP=
 MSATER_IP=
-while getopts "n:i:m:" arg 
+while getopts "n:i:m:" arg
 do
   case $arg in
     n)
@@ -34,7 +36,7 @@ done
 SCRIPT_DIR=`dirname $0`
 cd $SCRIPT_DIR/../
 SCRIPT_DIR=`pwd`
-echo "SCRIPT_DIR: $SCRIPT_DIR" 
+echo "SCRIPT_DIR: $SCRIPT_DIR"
 
 IN_TDINTERNAL="community"
 if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
@@ -46,10 +48,16 @@ fi
 TAOS_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
@@ -88,7 +96,7 @@ TAOS_CFG=$NODE_DIR/cfg/taos.cfg
 touch -f $TAOS_CFG
 
 TAOS_FLAG=$SIM_DIR/tsim/flag
-if [ -f "$TAOS_FLAG" ] ; then 
+if [ -f "$TAOS_FLAG" ] ; then
   TAOS_CFG=/etc/taos/taos.cfg
   DATA_DIR=/var/lib/taos
   LOG_DIR=/var/log/taos
@@ -98,7 +106,7 @@ if [ -f "$TAOS_FLAG" ] ; then
   sudo rm -rf $LOG_DIR
 fi
 
-echo " "                                  >> $TAOS_CFG   
+echo " "                                  >> $TAOS_CFG
 echo "masterIp            $MASTER_IP"     >> $TAOS_CFG
 echo "dataDir             $DATA_DIR"      >> $TAOS_CFG
 echo "logDir              $LOG_DIR"       >> $TAOS_CFG
diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh
index 9b61a33d45..cde27d7dc3 100755
--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
@@ -2,16 +2,18 @@
 
 echo "Executing deploy.sh"
 
-if [ $# != 4 ]; then 
+if [ $# != 4 ]; then
   echo "argument list need input : "
   echo "  -n nodeName"
   echo "  -i nodePort"
   exit 1
 fi
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
 NODE_NAME=
 NODE=
-while getopts "n:i:" arg 
+while getopts "n:i:" arg
 do
   case $arg in
     n)
@@ -29,7 +31,7 @@ done
 SCRIPT_DIR=`dirname $0`
 cd $SCRIPT_DIR/../
 SCRIPT_DIR=`pwd`
-echo "SCRIPT_DIR: $SCRIPT_DIR" 
+echo "SCRIPT_DIR: $SCRIPT_DIR"
 
 IN_TDINTERNAL="community"
 if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
@@ -41,10 +43,16 @@ fi
 TAOS_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/exec-default.sh b/tests/script/sh/exec-default.sh
index 1c84a6b10e..f648315c67 100755
--- a/tests/script/sh/exec-default.sh
+++ b/tests/script/sh/exec-default.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# if [ $# != 4 || $# != 5 ]; then 
+# if [ $# != 4 || $# != 5 ]; then
   # echo "argument list need input : "
   # echo "  -n nodeName"
   # echo "  -s start/stop"
@@ -8,10 +8,12 @@
   # exit 1
 # fi
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
 NODE_NAME=
 EXEC_OPTON=
 CLEAR_OPTION="false"
-while getopts "n:s:u:x:ct" arg 
+while getopts "n:s:u:x:ct" arg
 do
   case $arg in
     n)
@@ -52,10 +54,16 @@ fi
 TAOS_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/exec-no-random-fail.sh b/tests/script/sh/exec-no-random-fail.sh
index 2bd0a64923..e01b18a8e6 100755
--- a/tests/script/sh/exec-no-random-fail.sh
+++ b/tests/script/sh/exec-no-random-fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# if [ $# != 4 || $# != 5 ]; then 
+# if [ $# != 4 || $# != 5 ]; then
   # echo "argument list need input : "
   # echo "  -n nodeName"
   # echo "  -s start/stop"
@@ -8,10 +8,12 @@
   # exit 1
 # fi
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
 NODE_NAME=
 EXEC_OPTON=
 CLEAR_OPTION="false"
-while getopts "n:s:u:x:ct" arg 
+while getopts "n:s:u:x:ct" arg
 do
   case $arg in
     n)
@@ -52,10 +54,16 @@ fi
 TAOS_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
@@ -78,23 +86,23 @@ if [ -f "$TAOS_FLAG" ]; then
   EXE_DIR=/usr/local/bin/taos
 fi
 
-if [ "$CLEAR_OPTION" = "clear" ]; then 
-  echo rm -rf $MGMT_DIR $TSDB_DIR  
+if [ "$CLEAR_OPTION" = "clear" ]; then
+  echo rm -rf $MGMT_DIR $TSDB_DIR
   rm -rf $TSDB_DIR
   rm -rf $MGMT_DIR
 fi
 
-if [ "$EXEC_OPTON" = "start" ]; then 
+if [ "$EXEC_OPTON" = "start" ]; then
   echo "ExcuteCmd:" $EXE_DIR/taosd -c $CFG_DIR
-  
-  if [ "$SHELL_OPTION" = "true" ]; then 
+
+  if [ "$SHELL_OPTION" = "true" ]; then
     TT=`date +%s`
     mkdir ${LOG_DIR}/${TT}
-    nohup valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes   $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 &   
+    nohup valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no  --track-origins=yes --show-leak-kinds=all  -v  --workaround-gcc296-bugs=yes   $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 &
   else
-    nohup $EXE_DIR/taosd -c $CFG_DIR --random-file-fail-factor 0 > /dev/null 2>&1 & 
+    nohup $EXE_DIR/taosd -c $CFG_DIR --random-file-fail-factor 0 > /dev/null 2>&1 &
   fi
-  
+
 else
   #relative path
   RCFG_DIR=sim/$NODE_NAME/cfg
@@ -110,6 +118,6 @@ else
     fi
     sleep 1
     PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
-  done 
+  done
 fi
 
diff --git a/tests/script/sh/exec-random-fail.sh b/tests/script/sh/exec-random-fail.sh
index 3761498859..1f31899e3a 100755
--- a/tests/script/sh/exec-random-fail.sh
+++ b/tests/script/sh/exec-random-fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# if [ $# != 4 || $# != 5 ]; then 
+# if [ $# != 4 || $# != 5 ]; then
   # echo "argument list need input : "
   # echo "  -n nodeName"
   # echo "  -s start/stop"
@@ -8,10 +8,12 @@
   # exit 1
 # fi
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
 NODE_NAME=
 EXEC_OPTON=
 CLEAR_OPTION="false"
-while getopts "n:s:u:x:ct" arg 
+while getopts "n:s:u:x:ct" arg
 do
   case $arg in
     n)
@@ -52,10 +54,16 @@ fi
 TAOS_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/exec.sh b/tests/script/sh/exec.sh
index 1c84a6b10e..80b8cda428 100755
--- a/tests/script/sh/exec.sh
+++ b/tests/script/sh/exec.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# if [ $# != 4 || $# != 5 ]; then 
+# if [ $# != 4 || $# != 5 ]; then
   # echo "argument list need input : "
   # echo "  -n nodeName"
   # echo "  -s start/stop"
@@ -8,10 +8,13 @@
   # exit 1
 # fi
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
+
 NODE_NAME=
 EXEC_OPTON=
 CLEAR_OPTION="false"
-while getopts "n:s:u:x:ct" arg 
+while getopts "n:s:u:x:ct" arg
 do
   case $arg in
     n)
@@ -52,10 +55,16 @@ fi
 TAOS_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/exec_tarbitrator.sh b/tests/script/sh/exec_tarbitrator.sh
index 496b3e4ed6..e985bd6585 100755
--- a/tests/script/sh/exec_tarbitrator.sh
+++ b/tests/script/sh/exec_tarbitrator.sh
@@ -1,13 +1,15 @@
 #!/bin/bash
 
-# if [ $# != 2 || $# != 3 ]; then 
+# if [ $# != 2 || $# != 3 ]; then
   # echo "argument list need input : "
   # echo "  -s start/stop"
   # exit 1
 # fi
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
 EXEC_OPTON=
-while getopts "n:s:u:x:ct" arg 
+while getopts "n:s:u:x:ct" arg
 do
   case $arg in
     n)
@@ -49,10 +51,16 @@ fi
 TAOS_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/move_dnode.sh b/tests/script/sh/move_dnode.sh
index d6dc4bc3eb..d3650c18ad 100755
--- a/tests/script/sh/move_dnode.sh
+++ b/tests/script/sh/move_dnode.sh
@@ -2,10 +2,13 @@
 
 echo "Executing move_dnode.sh"
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
+
 SCRIPT_DIR=`dirname $0`
 cd $SCRIPT_DIR/../
 SCRIPT_DIR=`pwd`
-echo "SCRIPT_DIR: $SCRIPT_DIR" 
+echo "SCRIPT_DIR: $SCRIPT_DIR"
 
 IN_TDINTERNAL="community"
 if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
@@ -17,10 +20,16 @@ fi
 TAOS_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/mv_old_data.sh b/tests/script/sh/mv_old_data.sh
index 606ee171f1..3f4be6714f 100755
--- a/tests/script/sh/mv_old_data.sh
+++ b/tests/script/sh/mv_old_data.sh
@@ -2,10 +2,13 @@
 
 echo "Executing mv_old_data.sh"
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
+
 SCRIPT_DIR=`dirname $0`
 cd $SCRIPT_DIR/../
 SCRIPT_DIR=`pwd`
-echo "SCRIPT_DIR: $SCRIPT_DIR" 
+echo "SCRIPT_DIR: $SCRIPT_DIR"
 
 IN_TDINTERNAL="community"
 if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
@@ -17,10 +20,16 @@ fi
 TAOS_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
diff --git a/tests/script/sh/stop_dnodes.sh b/tests/script/sh/stop_dnodes.sh
index 1a6e7153c3..430f39901e 100755
--- a/tests/script/sh/stop_dnodes.sh
+++ b/tests/script/sh/stop_dnodes.sh
@@ -1,24 +1,36 @@
 #!/bin/sh
 
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
+
 PID=`ps -ef|grep /usr/bin/taosd | grep -v grep | awk '{print $2}'`
-if [ -n "$PID" ]; then 
-	echo systemctl stop taosd 
-	systemctl stop taosd
+if [ -n "$PID" ]; then
+  echo systemctl stop taosd
+  systemctl stop taosd
 fi
-  
+
 PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
 while [ -n "$PID" ]; do
-	echo kill -9 $PID 
-	pkill -9 taosd
-  fuser -k -n tcp 6030
+  echo kill -9 $PID
+  pkill -9 taosd
+  echo "Killing processes locking on port 6030"
+  if [[ "$OS_TYPE" != "Darwin" ]]; then
+    fuser -k -n tcp 6030
+  else
+    lsof -nti:6030 | xargs kill -9
+  fi
   PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
 done
 
 PID=`ps -ef|grep -w tarbitrator | grep -v grep | awk '{print $2}'`
 while [ -n "$PID" ]; do
-	echo kill -9 $PID 
-	pkill -9 tarbitrator
-  fuser -k -n tcp 6040
+  echo kill -9 $PID
+  pkill -9 tarbitrator
+  if [[ "$OS_TYPE" != "Darwin" ]]; then
+    fuser -k -n tcp 6040
+  else
+    lsof -nti:6040 | xargs kill -9
+  fi
   PID=`ps -ef|grep -w tarbitrator | grep -v grep | awk '{print $2}'`
 done
 
diff --git a/tests/script/test.sh b/tests/script/test.sh
index a092a38a2d..29a15db4dc 100755
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 ##################################################
-# 
-# Do simulation test 
+#
+# Do simulation test
 #
 ##################################################
 
@@ -14,6 +14,8 @@ RELEASE=0
 ASYNC=0
 VALGRIND=0
 UNIQUE=0
+UNAME_BIN=`which uname`
+OS_TYPE=`$UNAME_BIN`
 while getopts "f:avu" arg
 do
   case $arg in
@@ -51,10 +53,16 @@ fi
 TOP_DIR=`pwd`
 TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
+if [[ "$OS_TYPE" != "Darwin" ]]; then
+  cut_opt="--field="
+else
+  cut_opt="-f "
+fi
+
 if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2,3`
 else
-  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' ${cut_opt}2`
 fi
 
 BUILD_DIR=$TOP_DIR/$BIN_DIR/build
@@ -117,7 +125,7 @@ echo "wal                0"                       >> $TAOS_CFG
 echo "asyncLog           0"                       >> $TAOS_CFG
 echo "locale             en_US.UTF-8"             >> $TAOS_CFG
 echo "enableCoreFile     1"                       >> $TAOS_CFG
-echo " "                                          >> $TAOS_CFG  
+echo " "                                          >> $TAOS_CFG
 
 ulimit -n 600000
 ulimit -c unlimited
-- 
GitLab