From bd2f86f22c549474c81e3834cd8fdc70043f5a20 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Wed, 9 Nov 2022 22:22:55 +0800 Subject: [PATCH] ci:add the env that builds with sanitizer --- tests/parallel_test/cases.task | 4 ++-- tests/parallel_test/run_container.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index 3d3eca4e6d..f65156f04c 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -1,6 +1,6 @@ ,,y,unit-test,bash test.sh -,,,script,./test.sh -f tsim/user/basic.sim -,,,script,./test.sh -f tsim/user/password.sim +,,y,script,./test.sh -f tsim/user/basic.sim +,,y,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 diff --git a/tests/parallel_test/run_container.sh b/tests/parallel_test/run_container.sh index d93a0f9e96..eac1dc41c8 100755 --- a/tests/parallel_test/run_container.sh +++ b/tests/parallel_test/run_container.sh @@ -13,7 +13,7 @@ function usage() { } ent=0 -while getopts "w:d:c:t:o:e:sh" opt; do +while getopts "w:d:c:t:o:s:eh" opt; do case $opt in w) WORKDIR=$OPTARG @@ -67,7 +67,7 @@ fi #select whether the compilation environment includes sanitizer if [ "${buildSan}" == "y" ]; then - DEBUGPATH="buildSan" + DEBUGPATH="debugSan" elif [[ "${buildSan}" == "n" ]] || [[ "${case_build_san}" == "" ]]; then DEBUGPATH="debugNoSan" else @@ -80,7 +80,7 @@ if [ $ent -ne 0 ]; then extra_param="$extra_param -e" INTERNAL_REPDIR=$WORKDIR/TDinternal REPDIR=$INTERNAL_REPDIR/community - REPDIR_DEBUG=$WORKDIR/DEBUGPATH/ + REPDIR_DEBUG=$WORKDIR/$DEBUGPATH/ CONTAINER_TESTDIR=/home/TDinternal/community SIM_DIR=/home/TDinternal/sim REP_MOUNT_PARAM="$INTERNAL_REPDIR:/home/TDinternal" @@ -89,7 +89,7 @@ if [ $ent -ne 0 ]; then else # community edition REPDIR=$WORKDIR/TDengine - REPDIR_DEBUG=$WORKDIR/DEBUGPATH/ + REPDIR_DEBUG=$WORKDIR/$DEBUGPATH/ CONTAINER_TESTDIR=/home/TDengine SIM_DIR=/home/TDengine/sim REP_MOUNT_PARAM="$REPDIR:/home/TDengine"