From ac7baae88b67587184692a148fe97edac6121b4b Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Thu, 1 Apr 2021 10:14:25 +0800
Subject: [PATCH] fix travis output

---
 Jenkinsfile       | 4 +++-
 tests/test-all.sh | 5 -----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 433b46067a..bf2454c903 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,11 +42,12 @@ def pre_test(){
     killall -9 taosd ||echo "no taosd running"
     killall -9 gdb || echo "no gdb running"
     cd ${WKC}
-    git checkout develop
     git reset --hard HEAD~10 >/dev/null 
+    git checkout develop
     git pull >/dev/null
     git fetch origin +refs/pull/${CHANGE_ID}/merge
     git checkout -qf FETCH_HEAD
+    git clean -dfx
     find ${WKC}/tests/pytest -name \'*\'.sql -exec rm -rf {} \\;
     cd ${WK}
     git reset --hard HEAD~10
@@ -55,6 +56,7 @@ def pre_test(){
     cd ${WK}
     export TZ=Asia/Harbin
     date
+    git clean -dfx
     rm -rf ${WK}/debug
     mkdir debug
     cd debug
diff --git a/tests/test-all.sh b/tests/test-all.sh
index 883c1495e9..7bde698d95 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -25,9 +25,6 @@ function stopTaosd {
 function dohavecore(){
   corefile=`find $corepath -mmin 1`  
   core_file=`echo $corefile|cut -d " " -f2`
-  echo "corefile:$core_file"
-  echo "corepath:$corepath"
-  ls -l $corepath
   proc=`echo $corefile|cut -d "_" -f3`
   if [ -n "$corefile" ];then
     echo 'taosd or taos has generated core'
@@ -82,7 +79,6 @@ function runSimCaseOneByOne {
       # fi
       end_time=`date +%s`
       echo execution time of $case was `expr $end_time - $start_time`s. | tee -a out.log
-      dohavecore 0
     fi
   done < $1
 }
@@ -159,7 +155,6 @@ function runPyCaseOneByOne {
       else
         $line > /dev/null 2>&1
       fi
-      dohavecore 0
     fi
   done < $1
 }
-- 
GitLab