adjust file general/insert/basic1.sim

source/dnode/mgmt/daemon/src/daemon.c

@@ -92,6 +92,7 @@ void dmnPrintVersion() {
 }
 
 int dmnReadConfig(const char *path) {
+  tstrncpy(configDir, global.configDir, PATH_MAX);
   taosInitGlobalCfg();
   taosReadGlobalLogCfg();
 

tests/script/general/user/basic1.sim

@@ -5,7 +5,7 @@ sql connect
 
 print =============== show users
 sql show users
-if $rows != 3 then 
+if $rows != 1 then 
   return -1
 endi
 
@@ -21,7 +21,7 @@ sql_error drop account root
 print =============== create user1
 sql create user user1 PASS 'user1'
 sql show users
-if $rows != 4 then 
+if $rows != 2 then 
   return -1
 endi
 
@@ -33,7 +33,7 @@ print $data30 $data31 $data32
 print =============== create user2
 sql create user user2 PASS 'user2'
 sql show users
-if $rows != 5 then 
+if $rows != 3 then 
   return -1
 endi
 
@@ -46,7 +46,7 @@ print $data40 $data41 $data42
 print =============== drop user1
 sql drop user user1
 sql show users
-if $rows != 4 then 
+if $rows != 2 then 
   return -1
 endi
 
@@ -62,7 +62,7 @@ system sh/exec.sh -n dnode1 -s start
 
 print =============== show users
 sql show users
-if $rows != 4 then 
+if $rows != 2 then 
   return -1
 endi
 

tests/script/sh/exec.sh

@@ -9,7 +9,7 @@
 # fi
 
 set +e
-set -x
+#set -x
 
 UNAME_BIN=`which uname`
 OS_TYPE=`$UNAME_BIN`

tests/script/test.sh

@@ -126,7 +126,6 @@ if [ -n "$FILE_NAME" ]; then
   else
     echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f $FILE_NAME
     $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
   fi
 else
   echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f basicSuite.sim