diff --git a/tests/script/sh/checkValgrind.sh b/tests/script/sh/checkValgrind.sh index 56358f5954..075268c53c 100755 --- a/tests/script/sh/checkValgrind.sh +++ b/tests/script/sh/checkValgrind.sh @@ -4,13 +4,17 @@ set +e #set -x NODE_NAME= +DETAIL=0 -while getopts "n:" arg +while getopts "n:d" arg do case $arg in n) NODE_NAME=$OPTARG ;; + d) + DETAIL=1 + ;; ?) echo "unkown argument" ;; @@ -30,15 +34,20 @@ fi TAOS_DIR=`pwd` LOG_DIR=$TAOS_DIR/sim/$NODE_NAME/log -#CFG_DIR=$TAOS_DIR/sim/$NODE_NAME/cfg - -#echo ---- $LOG_DIR - -#errors=`grep "ERROR SUMMARY:" ${LOG_DIR}/valgrind-taosd-*.log | cut -d ' ' -f 2,3,4,5 | tr -d "\n"` error_summary=`cat ${LOG_DIR}/valgrind-taosd-*.log | grep "ERROR SUMMARY:" | awk '{print $4}' | awk '{sum+=$1}END{print sum}'` still_reachable=`cat ${LOG_DIR}/valgrind-taosd-*.log | grep "still reachable in" | wc -l` definitely_lost=`cat ${LOG_DIR}/valgrind-taosd-*.log | grep "definitely lost in" | wc -l` +indirectly_lost=`cat ${LOG_DIR}/valgrind-taosd-*.log | grep "indirectly lost in " | wc -l` +possibly_lost=`cat ${LOG_DIR}/valgrind-taosd-*.log | grep "possibly lost in " | wc -l` -let "errors=$still_reachable+$error_summary+$definitely_lost" +if [ $DETAIL -eq 1 ]; then + echo error_summary: $error_summary + echo still_reachable: $still_reachable + echo definitely_lost: $definitely_lost + echo indirectly_lost: $indirectly_lost + echo possibly_lost: $possibly_lost +fi + +let "errors=$still_reachable+$error_summary+$definitely_lost+$indirectly_lost+$possibly_lost" echo $errors diff --git a/tests/script/tsim/valgrind/basic.sim b/tests/script/tsim/valgrind/basic1.sim similarity index 68% rename from tests/script/tsim/valgrind/basic.sim rename to tests/script/tsim/valgrind/basic1.sim index fe7b6973d4..26eeb04cd3 100644 --- a/tests/script/tsim/valgrind/basic.sim +++ b/tests/script/tsim/valgrind/basic1.sim @@ -18,8 +18,6 @@ if $rows != 1 then return -1 endi -goto _OVER - print =============== step2: create alter drop show user sql create user u1 pass 'taosdata' sql show users @@ -29,5 +27,17 @@ sql alter user u1 pass 'taosdata' sql drop user u1 sql_error alter user u2 sysinfo 0 +print =============== step3: create alter drop show database +sql create database db vgroups 1 +sql show databases +sql show db.vgroups +sql drop database db +sql show databases + +print =============== step4: create drop dnode +sql create dnode $hostname port 7200 +sql drop dnode 2 +sql alter dnode 1 'debugflag 143' + _OVER: system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/tsim/valgrind/checkError.sim b/tests/script/tsim/valgrind/checkError.sim index 573c9821ed..357f289fd1 100644 --- a/tests/script/tsim/valgrind/checkError.sim +++ b/tests/script/tsim/valgrind/checkError.sim @@ -3,7 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -v sql connect -print =============== step1 +print =============== step1: show dnodes $x = 0 step1: @@ -19,7 +19,16 @@ if $rows != 1 then return -1 endi -print =============== step2 +print =============== step2: create alter drop show user +sql create user u1 pass 'taosdata' +sql show users +sql alter user u1 sysinfo 1 +sql alter user u1 enable 1 +sql alter user u1 pass 'taosdata' +sql drop user u1 +sql_error alter user u2 sysinfo 0 + +print =============== step3: print =============== stop system sh/exec.sh -n dnode1 -s stop -x SIGINT