未验证 提交 1baf1884 编写于 作者: H huili 提交者: GitHub

Merge pull request #5111 from taosdata/test/jenkins

[TD-2882]<test>if core,stop test
...@@ -6,15 +6,15 @@ GREEN='\033[1;32m' ...@@ -6,15 +6,15 @@ GREEN='\033[1;32m'
GREEN_DARK='\033[0;32m' GREEN_DARK='\033[0;32m'
GREEN_UNDERLINE='\033[4;32m' GREEN_UNDERLINE='\033[4;32m'
NC='\033[0m' NC='\033[0m'
function git_branch {
branch="`git branch 2>/dev/null | grep "^\*" | sed -e "s/^\*\ //"`" function dohavecore(){
if [ "${branch}" != "" ];then corefile=`find $corepath -mmin 1`
if [ "${branch}" = "(no branch)" ];then if [ -n "$corefile" ];then
branch="(`git rev-parse --short HEAD`...)" echo 'taosd or taos has generated core'
fi if [[ $1 == 1 ]];then
branch=(${branch////_}) exit 8
echo "$branch" fi
fi fi
} }
function runSimCaseOneByOne { function runSimCaseOneByOne {
while read -r line; do while read -r line; do
...@@ -42,6 +42,7 @@ function runSimCaseOneByOne { ...@@ -42,6 +42,7 @@ function runSimCaseOneByOne {
# fi # fi
end_time=`date +%s` end_time=`date +%s`
echo execution time of $case was `expr $end_time - $start_time`s. | tee -a out.log echo execution time of $case was `expr $end_time - $start_time`s. | tee -a out.log
dohavecore 0
fi fi
done < $1 done < $1
} }
...@@ -69,14 +70,15 @@ function runSimCaseOneByOnefq { ...@@ -69,14 +70,15 @@ function runSimCaseOneByOnefq {
out_log=`tail -1 out.log ` out_log=`tail -1 out.log `
if [[ $out_log =~ 'failed' ]];then if [[ $out_log =~ 'failed' ]];then
if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then
cp -r ../../../sim ~/sim_$(git_branch)_`date "+%Y_%m_%d_%H:%M:%S"` cp -r ../../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S"`
else else
cp -r ../../sim ~/sim_$(git_branch)_`date "+%Y_%m_%d_%H:%M:%S" ` cp -r ../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" `
fi fi
exit 8 exit 8
fi fi
end_time=`date +%s` end_time=`date +%s`
echo execution time of $case was `expr $end_time - $start_time`s. | tee -a out.log echo execution time of $case was `expr $end_time - $start_time`s. | tee -a out.log
dohavecore 1
fi fi
done < $1 done < $1
} }
...@@ -105,6 +107,7 @@ function runPyCaseOneByOne { ...@@ -105,6 +107,7 @@ function runPyCaseOneByOne {
else else
$line > /dev/null 2>&1 $line > /dev/null 2>&1
fi fi
dohavecore 0
fi fi
done < $1 done < $1
} }
...@@ -126,13 +129,14 @@ function runPyCaseOneByOnefq { ...@@ -126,13 +129,14 @@ function runPyCaseOneByOnefq {
end_time=`date +%s` end_time=`date +%s`
out_log=`tail -1 pytest-out.log ` out_log=`tail -1 pytest-out.log `
if [[ $out_log =~ 'failed' ]];then if [[ $out_log =~ 'failed' ]];then
cp -r ../../sim ~/sim_$(git_branch)_`date "+%Y_%m_%d_%H:%M:%S" ` cp -r ../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" `
exit 8 exit 8
fi fi
echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log
else else
$line > /dev/null 2>&1 $line > /dev/null 2>&1
fi fi
dohavecore 1
fi fi
done < $1 done < $1
} }
...@@ -140,7 +144,7 @@ totalFailed=0 ...@@ -140,7 +144,7 @@ totalFailed=0
totalPyFailed=0 totalPyFailed=0
tests_dir=`pwd` tests_dir=`pwd`
corepath=`grep -oP '.*(?=core_)' /proc/sys/kernel/core_pattern||grep -oP '.*(?=core-)' /proc/sys/kernel/core_pattern`
if [ "$2" != "python" ]; then if [ "$2" != "python" ]; then
echo "### run TSIM test case ###" echo "### run TSIM test case ###"
cd $tests_dir/script cd $tests_dir/script
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册