diff --git a/llvm_test_script/asan/run_asan_test.sh b/llvm_test_script/asan/run_asan_test.sh index ff974838f8487f0772d807b9ac631118b293783f..9980cd0a418b4f29e16505a5d2c3c8f155ba6133 100755 --- a/llvm_test_script/asan/run_asan_test.sh +++ b/llvm_test_script/asan/run_asan_test.sh @@ -8,8 +8,8 @@ fi git clone https://gitee.com/ya-ning-liu/wiki.git -tar -jxvf ${WORK_DIR}/llvm/packages/ohos-sysroot-dev.tar.bz2 -C ${WORK_DIR}/wiki/asan/ -tar -jxvf ${WORK_DIR}/llvm/packages/clang-dev-linux-x86_64.tar.bz2 -C ${WORK_DIR}/wiki/asan/ +tar -xvf ${WORK_DIR}/llvm/packages/ohos-sysroot-dev.tar.gz -C ${WORK_DIR}/wiki/asan/ +tar -xvf ${WORK_DIR}/llvm/packages/clang-dev-linux-x86_64.tar.gz -C ${WORK_DIR}/wiki/asan/ cp -r ${WORK_DIR}/llvm/toolchain/llvm-project ${WORK_DIR}/wiki/asan/ @@ -164,4 +164,4 @@ rm -rf ${logdir}/asan_unit_new.txt ${logdir}/asan_unit_old.txt if [[ ($check_asan_dynamic -eq 1) || ($check_asan -eq 1) || ($asan_uint -eq 1)]]; then echo "asan has failed tests" exit 1 -fi \ No newline at end of file +fi diff --git a/llvm_test_script/asan/run_build_oh.sh b/llvm_test_script/asan/run_build_oh.sh index 0bef8c7865a11c320c9a39d6e39f45c9c8faa26e..e9afd437de3359af4929ad1bba958c0639ac3b1b 100644 --- a/llvm_test_script/asan/run_build_oh.sh +++ b/llvm_test_script/asan/run_build_oh.sh @@ -10,14 +10,14 @@ llvm_dir="${WORK_DIR}/harmony_code/prebuilts/clang/ohos/linux-x86_64" if [[ -e "${llvm_dir}/llvm" ]];then rm -rf "${llvm_dir}/llvm" fi -tar -jxvf ${WORK_DIR}/llvm/packages/clang-dev-linux-x86_64.tar.bz2 -C ${llvm_dir} +tar -xvf ${WORK_DIR}/llvm/packages/clang-dev-linux-x86_64.tar.gz -C ${llvm_dir} mv ${llvm_dir}/clang-dev ${llvm_dir}/llvm # update libcxx-ndk if [[ -e "${llvm_dir}/libcxx-ndk" ]];then rm -rf "${llvm_dir}/libcxx-ndk" fi -tar -jxvf ${WORK_DIR}/llvm/packages/libcxx-ndk-dev-linux-x86_64.tar.bz2 -C ${llvm_dir} +tar -xvf ${WORK_DIR}/llvm/packages/libcxx-ndk-dev-linux-x86_64.tar.gz -C ${llvm_dir} # update llvm-ndk if [[ -e "${llvm_dir}/llvm_ndk" ]];then @@ -61,4 +61,4 @@ sudo udevadm control --reload hdc shell reboot loader python3 flash.py -q -python3 flash.py -a \ No newline at end of file +python3 flash.py -a diff --git a/llvm_test_script/run_docker.sh b/llvm_test_script/run_docker.sh index 5e70ffde1c37435afd68bfc63bd75a6fd9bd2e88..bc2427da954d210f0496dcc452e84c6d421fd115 100755 --- a/llvm_test_script/run_docker.sh +++ b/llvm_test_script/run_docker.sh @@ -110,13 +110,13 @@ python3 ./toolchain/llvm-project/llvm-build/build.py --no-build windows buildtime_e=`date +%s` sumbuildtime=$[ $buildtime_e - $buildtime_s ] echo "the build sumtime ---->: " " $sumbuildtime" -# sysroot的路径在 llvm/packages/ohos-sysroot-dev.tar.bz2 , 解压后在 /home/openharmony/llvm_tool/sysroot +# sysroot的路径在 llvm/packages/ohos-sysroot-dev.tar.gz , 解压后在 /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/packages/ohos-sysroot-dev.tar.bz2 -C ${WORK_DIR}/llvm_tool/ -tar -jxvf ${WORK_DIR}/llvm/packages/clang-dev-linux-x86_64.tar.bz2 -C ${WORK_DIR}/llvm_tool/ +tar -xvf ${WORK_DIR}/llvm/packages/ohos-sysroot-dev.tar.gz -C ${WORK_DIR}/llvm_tool/ +tar -xvf ${WORK_DIR}/llvm/packages/clang-dev-linux-x86_64.tar.gz -C ${WORK_DIR}/llvm_tool/ mv ${WORK_DIR}/llvm_tool/clang-dev ${WORK_DIR}/llvm_tool/clang endruntime=`date +%s` @@ -171,7 +171,7 @@ if echo ${check_type} | grep checksec; then llvmts_logdir="${WORK_DIR}/llvmts-log/checksec/${time_dir}" mkdir -p ${llvmts_logdir} if [ ! -d ${WORK_DIR}/llvm/packages/clang-dev ]; then - tar -jxvf ${WORK_DIR}/llvm/packages/clang-dev-linux-x86_64.tar.bz2 -C ${WORK_DIR}/llvm/packages/ + tar -xvf ${WORK_DIR}/llvm/packages/clang-dev-linux-x86_64.tar.gz -C ${WORK_DIR}/llvm/packages/ fi python3 check.py --root_dir ${WORK_DIR} --output_path ${WORK_DIR}/llvmts-log/checksec/${time_dir}/ 2>&1 | tee ${WORK_DIR}/check.txt cp ${WORK_DIR}/templates/bootstrap.bundle.min.js ${WORK_DIR}/llvmts-log/checksec/${time_dir}/