From 609d4e592eb59f307fad1a25ae6ee4d355296a3f Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 10 Nov 2022 18:01:44 +0800 Subject: [PATCH 1/7] test: check asan available --- tests/parallel_test/cases.task | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index 6775760ee4..f7ba6b083a 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -10,7 +10,7 @@ ,,,script,./test.sh -f tsim/user/password.sim ,,,script,./test.sh -f tsim/user/privilege_db.sim ,,,script,./test.sh -f tsim/user/privilege_sysinfo.sim -,,,script,./test.sh -f tsim/db/alter_option.sim +,,y,script,./test.sh -f tsim/db/alter_option.sim ,,,script,./test.sh -f tsim/db/alter_replica_13.sim ,,,script,./test.sh -f tsim/db/alter_replica_31.sim ,,,script,./test.sh -f tsim/db/basic1.sim From 8baf5b8fb385d333c3ab714c662c3d75c88d0db0 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 11 Nov 2022 09:07:30 +0800 Subject: [PATCH 2/7] test: check asan available --- tests/script/sh/checkAsan.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/script/sh/checkAsan.sh b/tests/script/sh/checkAsan.sh index d4801891ed..4d1b0a3d6b 100755 --- a/tests/script/sh/checkAsan.sh +++ b/tests/script/sh/checkAsan.sh @@ -17,10 +17,10 @@ fi TAOS_DIR=`pwd` LOG_DIR=$TAOS_DIR/sim/tsim/asan -error_num=`cat ${LOG_DIR}/tsim.asan | grep "ERROR" | wc -l` -memory_leak=`cat ${LOG_DIR}/tsim.asan | grep "Direct leak" | wc -l` -indirect_leak=`cat ${LOG_DIR}/tsim.asan | grep "Indirect leak" | wc -l` -runtime_error=`cat ${LOG_DIR}/tsim.asan | grep "runtime error" | wc -l` +error_num=`cat ${LOG_DIR}/*.asan | grep "ERROR" | wc -l` +memory_leak=`cat ${LOG_DIR}/*.asan | grep "Direct leak" | wc -l` +indirect_leak=`cat ${LOG_DIR}/*.asan | grep "Indirect leak" | wc -l` +runtime_error=`cat ${LOG_DIR}/*.asan | grep "runtime error" | wc -l` echo -e "\033[44;32;1m"asan error_num: $error_num"\033[0m" echo -e "\033[44;32;1m"asan memory_leak: $memory_leak"\033[0m" @@ -34,6 +34,6 @@ if [ $errors -eq 0 ]; then exit 0 else echo -e "\033[44;31;1m"asan total errors: $errors"\033[0m" - cat ${LOG_DIR}/tsim.asan + cat ${LOG_DIR}/*.asan exit 1 fi \ No newline at end of file From d11cf121a136fc2d6f61746976ae1e8b22a9b413 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Fri, 11 Nov 2022 12:44:00 +0800 Subject: [PATCH 3/7] ci:modify compilation options --- tests/parallel_test/container_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh index 4e06643ac4..4cf4b89143 100755 --- a/tests/parallel_test/container_build.sh +++ b/tests/parallel_test/container_build.sh @@ -69,7 +69,7 @@ mv ${REP_REAL_PATH}/debug ${WORKDIR}/debugNoSan date docker run \ -v $REP_MOUNT_PARAM \ - --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DSANITIZER=true;make -j $THREAD_COUNT" + --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true -DTOOLS_BUILD_TYPE=Debug e;make -j $THREAD_COUNT" mv ${REP_REAL_PATH}/debug ${WORKDIR}/debugSan From 6a2aa3ebb5dd693f084778304ee81dd3929af05e Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Fri, 11 Nov 2022 12:48:06 +0800 Subject: [PATCH 4/7] ci:modify compilation options --- tests/parallel_test/container_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh index 4cf4b89143..40996da730 100755 --- a/tests/parallel_test/container_build.sh +++ b/tests/parallel_test/container_build.sh @@ -69,7 +69,7 @@ mv ${REP_REAL_PATH}/debug ${WORKDIR}/debugNoSan date docker run \ -v $REP_MOUNT_PARAM \ - --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true -DTOOLS_BUILD_TYPE=Debug e;make -j $THREAD_COUNT" + --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true -DTOOLS_BUILD_TYPE=Debug;make -j $THREAD_COUNT" mv ${REP_REAL_PATH}/debug ${WORKDIR}/debugSan From 73a700de0fa99a559920d5147517e65cc19b0432 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Fri, 11 Nov 2022 12:50:01 +0800 Subject: [PATCH 5/7] ci:modify compilation options --- tests/parallel_test/container_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh index 40996da730..11412e9f69 100755 --- a/tests/parallel_test/container_build.sh +++ b/tests/parallel_test/container_build.sh @@ -69,7 +69,7 @@ mv ${REP_REAL_PATH}/debug ${WORKDIR}/debugNoSan date docker run \ -v $REP_MOUNT_PARAM \ - --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true -DTOOLS_BUILD_TYPE=Debug;make -j $THREAD_COUNT" + --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_SANITIZER=1 -DTOOLS_SANITIZE=true -DTOOLS_BUILD_TYPE=Debug;make -j $THREAD_COUNT || exit 1 " mv ${REP_REAL_PATH}/debug ${WORKDIR}/debugSan From 18b182eac9cf70017aba831352847d69796e10bc Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Fri, 11 Nov 2022 13:48:36 +0800 Subject: [PATCH 6/7] ci:add scripts executable permission --- tests/parallel_test/container_build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/parallel_test/container_build.sh diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh old mode 100644 new mode 100755 From 3024bdf121c72f049667729365a8fc74facf5258 Mon Sep 17 00:00:00 2001 From: haoranchen Date: Fri, 11 Nov 2022 16:31:14 +0800 Subject: [PATCH 7/7] Update container_build.sh --- tests/parallel_test/container_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh index 0deacf07ef..5059630a3f 100755 --- a/tests/parallel_test/container_build.sh +++ b/tests/parallel_test/container_build.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e function usage() { echo "$0"