TD-20478: update coverage test script

tests/script/coverage_test.sh

@@ -10,7 +10,8 @@ else
 fi
 
 today=`date +"%Y%m%d"`
-TDENGINE_DIR=/root/pxiao/TDengine
+TDENGINE_DIR=/root/TDengine
+JDBC_DIR=/root/taos-connector-jdbc
 TDENGINE_COVERAGE_REPORT=$TDENGINE_DIR/tests/coverage-report-$today.log
 
 # Color setting
@@ -20,7 +21,7 @@ GREEN_DARK='\033[0;32m'
 GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'
 
-function buildTDengine {
+function buildTDengine() {
 	echo "check if TDengine need build"
 	cd $TDENGINE_DIR
   	git remote prune origin > /dev/null
@@ -33,159 +34,145 @@ function buildTDengine {
 	# reset counter
 	lcov -d . --zerocounters
 
-
 	if [ "$LOCAL_COMMIT" == "$REMOTE_COMMIT" ]; then
 		echo "repo up-to-date"
 	else
 		echo "repo need to pull"
 	fi
 
-    	git reset --hard
-    	git checkout -- .
-    	git checkout $branch
+	git reset --hard
+	git checkout -- .
+	git checkout $branch
+	git checkout -- .
 	git clean -dfx
-	git pull
-    	git submodule update --init --recursive -f
+	git pull    
  	
   	[ -d $TDENGINE_DIR/debug ] || mkdir $TDENGINE_DIR/debug
   	cd $TDENGINE_DIR/debug
 
-    	echo "rebuild.."
+    echo "rebuild.."
 	LOCAL_COMMIT=`git rev-parse --short @`
 
 	rm -rf *
 	if [ "$branch" == "3.0" ]; then
 		echo "3.0 ============="
-		cmake -DCOVER=true -DBUILD_TEST=true .. 
+		cmake -DCOVER=true -DBUILD_TEST=true -DBUILD_HTTP=false -DBUILD_TOOLS=true .. 
 	else
 		cmake -DCOVER=true -DBUILD_TOOLS=true -DBUILD_HTTP=false .. > /dev/null
 	fi
-	make -j4
+	make -j
 	make install
 }
 
-function runGeneralCaseOneByOne {
+function runCasesOneByOne () {
 	while read -r line; do
-		if [[ $line =~ ^./test.sh* ]]; then
-			case=`echo $line | grep sim$ | awk '{print $NF}'`
-
-			if [ -n "$case" ]; then
-				date +%F\ %T | tee -a  $TDENGINE_COVERAGE_REPORT  && ./test.sh -f $case > /dev/null 2>&1 && \
-				 echo -e "${GREEN}$case success${NC}" | tee -a  $TDENGINE_COVERAGE_REPORT \
-				|| echo -e "${RED}$case failed${NC}" | tee -a  $TDENGINE_COVERAGE_REPORT
-			fi
+		cmd=`echo $line | cut -d',' -f 5`		
+		if [[ "$2" == "sim" ]] && [[ $cmd == *"test.sh"* ]]; then
+			case=`echo $cmd | cut -d' ' -f 3`
+			start_time=`date +%s`
+			date +%F\ %T | tee -a  $TDENGINE_COVERAGE_REPORT  && $cmd > /dev/null 2>&1 && \
+			echo -e "${GREEN}$case success${NC}" | tee -a  $TDENGINE_COVERAGE_REPORT \
+			|| echo -e "${RED}$case failed${NC}" | tee -a  $TDENGINE_COVERAGE_REPORT
+			end_time=`date +%s`
+			echo execution time of $case was `expr $end_time - $start_time`s. | tee -a $TDENGINE_COVERAGE_REPORT
+		elif [[ "$2" == "system-test" ]] && [[ $line == *"system-test"* ]]; then
+			case=`echo $cmd | cut -d' ' -f 4`
+			start_time=`date +%s`
+			date +%F\ %T | tee -a $TDENGINE_COVERAGE_REPORT && $cmd > /dev/null 2>&1 && \
+			echo -e "${GREEN}$case success${NC}" | tee -a $TDENGINE_COVERAGE_REPORT || \
+			echo -e "${RED}$case failed${NC}" | tee -a $TDENGINE_COVERAGE_REPORT
+			end_time=`date +%s`
+			echo execution time of $case was `expr $end_time - $start_time`s. | tee -a $TDENGINE_COVERAGE_REPORT
+		elif [[ "$2" == "develop-test" ]] && [[ $line == *"develop-test"* ]]; then
+			case=`echo $cmd | cut -d' ' -f 4`
+			start_time=`date +%s`
+			date +%F\ %T | tee -a $TDENGINE_COVERAGE_REPORT && $cmd > /dev/null 2>&1 && \
+			echo -e "${GREEN}$case success${NC}" | tee -a $TDENGINE_COVERAGE_REPORT || \
+			echo -e "${RED}$case failed${NC}" | tee -a $TDENGINE_COVERAGE_REPORT
+			end_time=`date +%s`
+			echo execution time of $case was `expr $end_time - $start_time`s. | tee -a $TDENGINE_COVERAGE_REPORT			
 		fi
 	done < $1
 }
 
-function runTestNGCaseOneByOne {
-	while read -r line; do
-		if [[ $line =~ ^taostest* ]]; then
-			case=`echo $line | cut -d' ' -f 3 | cut -d'=' -f 2`
-			yaml=`echo $line | cut -d' ' -f 2`
-
-			if [ -n "$case" ]; then
-				date +%F\ %T | tee -a  $TDENGINE_COVERAGE_REPORT  && taostest $yaml --case=$case --keep --disable_collection > /dev/null 2>&1 && \
-				 echo -e "${GREEN}$case success${NC}" | tee -a  $TDENGINE_COVERAGE_REPORT \
-				|| echo -e "${RED}$case failed${NC}" | tee -a  $TDENGINE_COVERAGE_REPORT
-			fi
-		fi
-	done < $1
+function runUnitTest() {
+	echo "=== Run unit test case ==="
+	echo " $TDENGINE_DIR/debug"
+	cd $TDENGINE_DIR/debug
+	ctest -j12
+	echo "3.0 unit test done"
 }
 
-function runTest {
-	echo "run Test"
-
-	if [ "$branch" == "3.0" ]; then
-		echo "start run unit test case ................"
-		echo " $TDENGINE_DIR/debug "
-		cd $TDENGINE_DIR/debug
-		ctest -j12
-		echo "3.0 unit test done"
-	fi
-
+function runSimCases() {
+	echo "=== Run sim cases ==="
+	
 	cd $TDENGINE_DIR/tests/script
+	runCasesOneByOne ../parallel_test/cases.task sim	
+	
+	totalSuccess=`grep 'sim success' $TDENGINE_COVERAGE_REPORT | wc -l`
+	if [ "$totalSuccess" -gt "0" ]; then
+		echo "### Total $totalSuccess SIM test case(s) succeed! ###" | tee -a $TDENGINE_COVERAGE_REPORT
+	fi
 
-	[ -d ../../sim ] && rm -rf ../../sim
-	[ -f $TDENGINE_COVERAGE_REPORT ] && rm $TDENGINE_COVERAGE_REPORT
+	totalFailed=`grep 'sim failed\|fault' $TDENGINE_COVERAGE_REPORT | wc -l`
+	if [ "$totalFailed" -ne "0" ]; then
+		echo "### Total $totalFailed SIM test case(s) failed! ###" | tee -a $TDENGINE_COVERAGE_REPORT
+	fi
+}
 
-	runGeneralCaseOneByOne jenkins/basic.txt
+function runPythonCases() {
+	echo "=== Run python cases ==="
+		
+	cd $TDENGINE_DIR/tests/system-test
+	runCasesOneByOne ../parallel_test/cases.task system-test
 
-	sed -i "1i\SIM cases test result" $TDENGINE_COVERAGE_REPORT
+	cd $TDENGINE_DIR/tests/develop-test
+	runCasesOneByOne ../parallel_test/cases.task develop-test
 
-	totalSuccess=`grep 'success' $TDENGINE_COVERAGE_REPORT | wc -l`
+	totalSuccess=`grep 'py success' $TDENGINE_COVERAGE_REPORT | wc -l`
 	if [ "$totalSuccess" -gt "0" ]; then
-		sed -i -e "2i\ ### Total $totalSuccess SIM test case(s) succeed! ###"  $TDENGINE_COVERAGE_REPORT
+		echo "### Total $totalSuccess python test case(s) succeed! ###" | tee -a $TDENGINE_COVERAGE_REPORT
 	fi
 
-	totalFailed=`grep 'failed\|fault' $TDENGINE_COVERAGE_REPORT | wc -l`
+	totalFailed=`grep 'py failed\|fault' $TDENGINE_COVERAGE_REPORT | wc -l`
 	if [ "$totalFailed" -ne "0" ]; then
-		sed -i "3i\### Total $totalFailed SIM test case(s) failed! ###"  $TDENGINE_COVERAGE_REPORT
+		echo "### Total $totalFailed python test case(s) failed! ###" | tee -a $TDENGINE_COVERAGE_REPORT
 	fi
-	sed "3G"  $TDENGINE_COVERAGE_REPORT
+}
 
-	stopTaosd
-	echo "run TestNG cases"
-	rm -rf /var/lib/taos/*
-	rm -rf /var/log/taos/*
-        nohup $TDENGINE_DIR/debug/build/bin/taosd -c /etc/taos > /dev/null 2>&1 &
-        sleep 10
-	cd $TDENGINE_DIR/../TestNG/cases
-	runTestNGCaseOneByOne ../scripts/cases.txt
-	echo "TestNG cases done"
-
-	cd $TDENGINE_DIR/tests
-	rm -rf ../sim
-	/root/pxiao/test-all-coverage.sh full python $branch | tee -a $TDENGINE_COVERAGE_REPORT
-	
-	
-	sed -i "4i\Python cases test result" $TDENGINE_COVERAGE_REPORT
-	totalPySuccess=`grep 'python case(s) succeed!' $TDENGINE_COVERAGE_REPORT | awk '{print $4}'`
-	if [ "$totalPySuccess" -gt "0" ]; then
-                sed -i -e "5i\ ### Total $totalPySuccess Python test case(s) succeed! ###"  $TDENGINE_COVERAGE_REPORT
-        fi
-
-	totalPyFailed=`grep 'python case(s) failed!' $TDENGINE_COVERAGE_REPORT | awk '{print $4}'`
-        if [ -z $totalPyFailed ]; then
-		sed -i "6i\\n"  $TDENGINE_COVERAGE_REPORT
-        else
-		sed -i "6i\### Total $totalPyFailed Python test case(s) failed! ###"  $TDENGINE_COVERAGE_REPORT
-        fi
-
-	echo "### run JDBC test cases ###" | tee -a $TDENGINE_COVERAGE_REPORT
-	# Test Connector
-	stopTaosd
-	nohup $TDENGINE_DIR/debug/build/bin/taosd -c /etc/taos > /dev/null 2>&1 &
-	sleep 10
+function runJDBCCases() {
+	echo "=== Run JDBC cases ==="
 
-	cd $TDENGINE_DIR/src/connector/jdbc
-	mvn clean package > /dev/null 2>&1
-	mvn test > jdbc-out.log 2>&1
-  	tail -n 20 jdbc-out.log 2>&1 | tee -a $TDENGINE_COVERAGE_REPORT
+	cd $JDBC_DIR
+	git checkout -- .
+	git reset --hard HEAD
+	git checkout main
+	git pull
 
-	# Test C Demo
 	stopTaosd
-	$TDENGINE_DIR/debug/build/bin/taosd -c $TDENGINE_DIR/debug/test/cfg > /dev/null &
-	sleep 10
-	yes | $TDENGINE_DIR/debug/build/bin/demo 127.0.0.1 > /dev/null 2>&1 | tee -a $TDENGINE_COVERAGE_REPORT
-
-	# Test waltest
-	dataDir=`grep dataDir $TDENGINE_DIR/debug/test/cfg/taos.cfg|awk '{print $2}'`
-	walDir=`find $dataDir -name "wal"|head -n1`
-	echo "dataDir: $dataDir" | tee -a $TDENGINE_COVERAGE_REPORT
-	echo "walDir: $walDir" | tee -a $TDENGINE_COVERAGE_REPORT
-	if [ -n "$walDir" ]; then
-		yes | $TDENGINE_DIR/debug/build/bin/waltest -p $walDir > /dev/null 2>&1 | tee -a $TDENGINE_COVERAGE_REPORT
-	fi
+	stopTaosadapter
 
-  # run Unit Test
-  echo "Run Unit Test: utilTest, queryTest and cliTest"
-  #$TDENGINE_DIR/debug/build/bin/utilTest > /dev/null 2>&1 && echo "utilTest pass!" || echo "utilTest failed!"
-  #$TDENGINE_DIR/debug/build/bin/queryTest > /dev/null 2>&1 && echo "queryTest pass!" || echo "queryTest failed!"
-  #$TDENGINE_DIR/debug/build/bin/cliTest > /dev/null 2>&1 && echo "cliTest pass!" || echo "cliTest failed!"
+	taosd -c /etc/taos >> /dev/null 2>&1 &
+	taosadapter >> /dev/null 2>&1 &
 
-	stopTaosd
+	mvn clean test > result.txt 2>&1
+	summary=`grep "Tests run:" result.txt | tail -n 1`		
+	echo -e "### JDBC test result: $summary ###" | tee -a $TDENGINE_COVERAGE_REPORT
+}
+
+function runTest() {
+	echo "run Test"
+	
+	cd $TDENGINE_DIR
+	[ -d sim ] && rm -rf sim
+    [ -f $TDENGINE_COVERAGE_REPORT ] && rm $TDENGINE_COVERAGE_REPORT
 
+	runUnitTest
+	runSimCases
+	runPythonCases
+	runJDBCCases
+	
+	stopTaosd	
 	cd $TDENGINE_DIR/tests/script
 	find . -name '*.sql' | xargs rm -f
 
@@ -203,15 +190,18 @@ function lcovFunc {
 	# remove exclude paths
 	if [ "$branch" == "3.0" ]; then
 		lcov --remove coverage.info \
-			'*/contrib/*' '*/tests/*' '*/test/*'\
-		       	'*/AccessBridgeCalls.c' '*/ttszip.c' '*/dataInserter.c' '*/tlinearhash.c' '*/tsimplehash.c'\
+			'*/contrib/*' '*/tests/*' '*/test/*' '*/tools/*' '*/libs/sync/*'\
+			'*/AccessBridgeCalls.c' '*/ttszip.c' '*/dataInserter.c' '*/tlinearhash.c' '*/tsimplehash.c' '*/tsdbDiskData.c'\
 			'*/texpr.c' '*/runUdf.c' '*/schDbg.c' '*/syncIO.c' '*/tdbOs.c' '*/pushServer.c' '*/osLz4.c'\
-		       	'*/tbase64.c' '*/tbuffer.c' '*/tdes.c' '*/texception.c' '*/tidpool.c' '*/tmempool.c'\
-		       	'*/tthread.c' '*/tversion.c'\
+			'*/tbase64.c' '*/tbuffer.c' '*/tdes.c' '*/texception.c' '*/tidpool.c' '*/tmempool.c'\
+			'*/clientJniConnector.c' '*/clientTmqConnector.c' '*/version.c' '*/shellAuto.c' '*/shellTire.c'\
+			'*/tthread.c' '*/tversion.c' '*/ctgDbg.c' '*/schDbg.c' '*/qwDbg.c' '*/tencode.h' '*/catalog.c'\
+			'*/tqSnapshot.c' '*/tsdbSnapshot.c''*/metaSnapshot.c' '*/smaSnapshot.c' '*/tqOffsetSnapshot.c'\
+			'*/vnodeSnapshot.c' '*/metaSnapshot.c' '*/tsdbSnapshot.c' '*/mndGrant.c' '*/mndSnode.c' '*/streamRecover.c'\
 		       	--rc lcov_branch_coverage=1 -o coverage.info
 	else	
 		lcov --remove coverage.info \
-    		'*/tests/*' '*/test/*' '*/deps/*' '*/plugins/*' '*/taosdef.h' '*/ttype.h' '*/tarithoperator.c' '*/TSDBJNIConnector.c' '*/taosdemo.c'\
+    		'*/tests/*' '*/test/*' '*/deps/*' '*/plugins/*' '*/taosdef.h' '*/ttype.h' '*/tarithoperator.c' '*/TSDBJNIConnector.c' '*/taosdemo.c' '*/clientJniConnector.c'\
     		--rc lcov_branch_coverage=1 -o coverage.info
 	fi
 
@@ -257,35 +247,33 @@ function stopTaosd {
 	echo "Stop tasod end"
 }
 
-function runTestRandomFail {
-  exec_random_fail_sh=$1
-  default_exec_sh=$TDENGINE_DIR/tests/script/sh/exec.sh
-	[ -f $exec_random_fail_sh ] && cp $exec_random_fail_sh $default_exec_sh || exit 1
-
-  dnodes_random_fail_py=$TDENGINE_DIR/tests/pytest/util/dnodes-no-random-fail.py
-  default_dnodes_py=$TDENGINE_DIR/tests/pytest/util/dnodes.py
-	[ -f $dnodes_random_fail_py ] && cp $dnodes_random_fail_py $default_dnodes_py || exit 1
+function stopTaosadapter {
+	echo "Stop taosadapter"
+	systemctl stop taosadapter.service
+	PID=`ps -ef|grep -w taosadapter | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+		pkill -TERM -x taosadapter
+		sleep 1
+		PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+	echo "Stop tasoadapter end"
 
-  runTest NoRandomFail
 }
 
-WORK_DIR=/root/pxiao
+WORK_DIR=/root/
 
 date >> $WORK_DIR/cron.log
 echo "Run Coverage Test" | tee -a $WORK_DIR/cron.log
 
 stopTaosd
-buildTDengine
-
-#runTestRandomFail $TDENGINE_DIR/tests/script/sh/exec-random-fail.sh 
-#runTestRandomFail $TDENGINE_DIR/tests/script/sh/exec-default.sh 
-#runTestRandomFail $TDENGINE_DIR/tests/script/sh/exec-no-random-fail.sh 
 
+buildTDengine
 runTest
-
 lcovFunc
-#sendReport
+
+sendReport
 stopTaosd
 
 date >> $WORK_DIR/cron.log
-echo "End of Coverage Test" | tee -a $WORK_DIR/cron.log
+echo "End of Coverage Test" | tee -a $WORK_DIR/cron.log
\ No newline at end of file