From d94e6ee8524edf96a71f74a686826b206a382f45 Mon Sep 17 00:00:00 2001
From: liuyaning <liuyaning7@huawei.com>
Date: Mon, 27 Mar 2023 16:19:47 +0800
Subject: [PATCH] fix lldb-test and delete history files

Signed-off-by: liuyaning <liuyaning7@huawei.com>
---
 llvm_test_script/run_docker.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/llvm_test_script/run_docker.sh b/llvm_test_script/run_docker.sh
index 95215cc..b11cf93 100755
--- a/llvm_test_script/run_docker.sh
+++ b/llvm_test_script/run_docker.sh
@@ -3,7 +3,6 @@ git config --global user.email "yiibai.com@gmail.com"
 
 # 门禁上路径是/home/pool_002/harmony_master
 WORK_DIR=${PWD}
-mkdir -p ${WORK_DIR}/llvm
 
 # llvmts
 # llvmts + patch : ${WORK_DIR}/llvm-test-suite
@@ -19,6 +18,10 @@ git clone https://gitee.com/liwentao_uiw/llvmopen-source-transfer-gitee.git -b o
 
 
 # prepare llvm source
+if [ -d ${WORK_DIR}/llvm ]; then
+    rm -rf ${WORK_DIR}/llvm
+fi
+mkdir -p ${WORK_DIR}/llvm
 cd ${WORK_DIR}/llvm
 # 如果是第一次执行 init 会弹出repo Testing colorized output ,需要输入一次Y
 #(sleep 10; echo y;) | repo init -u https://gitee.com/liwentao_uiw/manifest.git -b llvm-ci
@@ -54,6 +57,9 @@ bash ./toolchain/llvm-project/llvm-build/env_prepare.sh
 # build
 python3 ./toolchain/llvm-build/build.py --no-build windows
 # sysroot的路径在 llvm/out/ohos-sysroot-dev.tar.bz2 , 解压后在 /home/openharmony/llvm_tool/sysroot
+if [ -d ${WORK_DIR}/llvm_tool/ ]; then
+    rm -rf ${WORK_DIR}/llvm_tool
+fi
 mkdir ${WORK_DIR}/llvm_tool/
 tar -jxvf ${WORK_DIR}/llvm/out/ohos-sysroot-dev.tar.bz2 -C ${WORK_DIR}/llvm_tool/
 tar -jxvf ${WORK_DIR}/llvm/out/clang-dev-linux-x86_64.tar.bz2 -C ${WORK_DIR}/llvm_tool/
@@ -74,9 +80,7 @@ mkdir -p  ${llvmts_logdir}
 
 # run lldb unit shell api tests
 export LD_LIBRARY_PATH="${WORK_DIR}/llvm/out/llvm_make/lib"
-apt-get install libc++1
-sleep 10
-echo y
+(sleep 10; echo y;) | apt-get install libc++1
 pushd ${WORK_DIR}/llvm/out/llvm_make
 ../../prebuilts/cmake/linux-x86/bin/ninja check-lldb-unit | tee ${llvmts_logdir}/lldb_unit_${TIME}.txt
 ./bin/llvm-lit -sv tools/lldb/test/Shell/ --max-time 300  | tee ${llvmts_logdir}/lldb_shell_${TIME}.txt
@@ -102,8 +106,8 @@ fi
 api=1
 if [ -e ${llvmts_logdir}/lldb_api_${TIME}.txt ]; then
     api=0
-    api_unsupported="$(grep -E "Unsupported:" ${llvmts_logdir}/lldb_api_${TIME}.txt | tr -d [A-Z][a-z]' ':)"
-    api_expe_fail="$(grep -E "Expectedly Failed:" ${llvmts_logdir}/lldb_shell_${TIME}.txt | tr -d [A-Z][a-z]' ':)"
+    api_unsupported="$(grep -E "Unsupported+\s+:" ${llvmts_logdir}/lldb_api_${TIME}.txt | tr -d [A-Z][a-z]' ':)"
+    api_expe_fail="$(grep -E "Expectedly Failed:" ${llvmts_logdir}/lldb_api_${TIME}.txt | tr -d [A-Z][a-z]' ':)"
     api_failed="$(grep -E "Failed+\s+:" ${llvmts_logdir}/lldb_api_${TIME}.txt | tr -d [A-Z][a-z]' ':)"
     if [[ (-n "$api_unsupported" && $api_unsupported -gt 282) || (-n "$api_expe_fail" && $api_expe_fail -gt 5) || (-n "$api_failed" && $api_failed -gt 2) ]]; then
         api=1
-- 
Gitee