diff --git a/llvm_test_script/run_docker.sh b/llvm_test_script/run_docker.sh index e41e6938f673942a76810981fef956738ca43a5c..f7fc9baa051291f5ba463d9bdb3ac8ededac1915 100755 --- a/llvm_test_script/run_docker.sh +++ b/llvm_test_script/run_docker.sh @@ -100,21 +100,23 @@ llvmts_logdir="${WORK_DIR}/llvmts-log/${time_dir}" mkdir -p ${llvmts_logdir} # run lldb unit shell api tests -export LD_LIBRARY_PATH="${WORK_DIR}/llvm/out/llvm_make/lib" +export LD_LIBRARY_PATH="${WORK_DIR}/llvm/out/llvm_make/lib:${WORK_DIR}/llvm/out/llvm_make/lib/x86_64-unknown-linux-gnu" dest_path="${WORK_DIR}/llvm/out/llvm_make/tools/lldb/unittests/ScriptInterpreter" if [ ! -d ${dest_path}/python3/ ]; then ln -s "${WORK_DIR}/llvm/out/llvm_make/python3/" ${dest_path} fi -(sleep 10; echo y;) | apt-get install libc++1 startTime=`date +%Y%m%d-%H:%M:%S` startTime_s=`date +%s` echo "test exec start" 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 & -./bin/llvm-lit -sv tools/lldb/test/API/ --max-time 300 | tee ${llvmts_logdir}/lldb_api_${TIME}.txt & +../../prebuilts/cmake/linux-x86/bin/ninja -v check-lldb-unit +unit=$? +./bin/llvm-lit -sv tools/lldb/test/Shell/ --max-time 300 +shell=$? +./bin/llvm-lit -sv tools/lldb/test/API/ --max-time 300 +api=$? popd @@ -133,33 +135,6 @@ sumTime=$[ $endTime_s - $startTime_s ] echo "$startTime ---> $endTime" "Total:$sumTime seconds" -# 正则会出来结果会是 Failed : x,通过tr - 去除字母字符保留数字 -unit=1 -if [ -e ${llvmts_logdir}/lldb_unit_${TIME}.txt ]; then - unit="$(grep -E "Failed:" ${llvmts_logdir}/lldb_unit_${TIME}.txt | tr -d [A-Z][a-z]' ':)" -fi - -shell=1 -if [ -e ${llvmts_logdir}/lldb_shell_${TIME}.txt ]; then - shell=0 - shell_unsupported="$(grep -E "Unsupported+\s+:" ${llvmts_logdir}/lldb_shell_${TIME}.txt | tr -d [A-Z][a-z]' ':)" - shell_expe_fail="$(grep -E "Expectedly Failed:" ${llvmts_logdir}/lldb_shell_${TIME}.txt | tr -d [A-Z][a-z]' ':)" - shell_failed="$(grep -E "Failed+\s+:" ${llvmts_logdir}/lldb_shell_${TIME}.txt | tr -d [A-Z][a-z]' ':)" - if [[ (-n "$shell_unsupported" && $shell_unsupported -gt 96) || (-n "$shell_expe_fail" && $shell_expe_fail -gt 6) || (-n "$shell_failed" && $shell_failed -gt 0) ]]; then - shell=1 - fi -fi - -api=1 -if [ -e ${llvmts_logdir}/lldb_api_${TIME}.txt ]; then - api=0 - 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 3) ]]; then - api=1 - fi -fi if [[ (-n "$unit" && $unit -gt 0) || $shell -eq 1 || $api -eq 1 ]]; then exit 1