From 633a5d979e50fc8596050b930f8f785ad5dea721 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Tue, 20 Dec 2022 15:42:57 +0800
Subject: [PATCH] test: update coverage test script

---
 tests/script/coverage_test.sh | 60 ++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/tests/script/coverage_test.sh b/tests/script/coverage_test.sh
index 3983f533da..e0e7490d3a 100755
--- a/tests/script/coverage_test.sh
+++ b/tests/script/coverage_test.sh
@@ -66,32 +66,40 @@ function buildTDengine() {
 
 function runCasesOneByOne () {
 	while read -r line; do
-		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
+		if [[ "$line" != "#"* ]]; then
+			cmd=`echo $line | cut -d',' -f 5`
+            if [[ "$2" == "sim" ]] && [[ $line == *"script"* ]]; 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
+                if [[ "$cmd" == *"pytest.sh"* ]]; then
+                    cmd=`echo $cmd | cut -d' ' -f 2-20`
+                fi
+                case=`echo $cmd | cut -d' ' -f 4-20`
+                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
+                if [[ "$cmd" == *"pytest.sh"* ]]; then
+                    cmd=`echo $cmd | cut -d' ' -f 2-20`
+                fi
+                case=`echo $cmd | cut -d' ' -f 4-20`
+                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
+        fi
 	done < $1
 }
 
-- 
GitLab