From b6888a45f0d74bf1062f139790786944c9a6bd71 Mon Sep 17 00:00:00 2001 From: liujie44 Date: Tue, 3 Dec 2024 16:23:00 +0800 Subject: [PATCH 1/7] update blacklist --- scripts/distribute/ci_case_auto.sh | 26 +++++++++++++++++++++++--- scripts/distribute/ci_case_dy.sh | 24 ++++++++++++++++++++++-- scripts/distribute/run_ci.sh | 2 ++ 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/scripts/distribute/ci_case_auto.sh b/scripts/distribute/ci_case_auto.sh index 75c511bb447f..67b6e55687b9 100755 --- a/scripts/distribute/ci_case_auto.sh +++ b/scripts/distribute/ci_case_auto.sh @@ -80,11 +80,28 @@ function restore_func() { done } +function executable_fun_list() { + fun_list_origin=$1 + fun_list=() + if [ ! -f "$root_path/blacklist.csv" ];then + wget -P $root_path/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 + fi + mapfile -t blacklist < $root_path/blacklist.csv + for fun in "${fun_list_origin[@]}"; do + # 检查函数是否在黑名单中 + if [[ ! " ${blacklist[@]} " == *" $fun "* ]]; then + # 如果不在黑名单中,添加到可执行函数列表 + fun_list+=("$fun") + else + echo "$fun is in the blacklist. Not added to executable list." + fi + done +} # NOTE: Please place the new tests as much as possible after the existing tests function llama_case_list_auto() { - fun_list=( + fun_list_origin=( # The test name must have "llama_" as a prefix, which will # be used for tracking the execution status of the case. llama_dygraph_auto_bs8_fp32_DP2 @@ -102,6 +119,7 @@ function llama_case_list_auto() { llama_align_dy2st_fthenb_and_vpp_auto_bs2_fp32_DP1-MP1-PP4 llama_align_dygraph_dy2st_pir_auto_pp_bs2_bf16_DP1-MP1-PP4 ) + executable_fun_list $fun_list_origin if [ $1 = "prepare_case" ]; then restore_func $fun_list elif [ $1 = "exec_case" ]; then @@ -117,7 +135,7 @@ function llama_case_list_auto() { function llm_gpt_case_list_auto() { - fun_list=( + fun_list_origin=( # The test name must have "llm_gpt_dygraph_auto_" as a prefix, # which will be used for tracking the execution status of the case. llm_gpt_dygraph_auto_bs8_fp32_DP2 @@ -127,6 +145,7 @@ function llm_gpt_case_list_auto() { llm_gpt_pir_auto_bs4_TP2 llm_gpt_pir_auto_bs4_TP2_PP2 ) + executable_fun_list $fun_list_origin if [ $1 = "prepare_case" ]; then restore_func $fun_list elif [ $1 = "exec_case" ]; then @@ -141,7 +160,7 @@ function llm_gpt_case_list_auto() { } function llm_qwen_case_list_auto() { - fun_list=( + fun_list_origin=( # The test name must have "llm_qwen_dygraph_auto_" as a prefix, # which will be used for tracking the execution status of the case. llm_qwen_dygraph_auto_bs1_fp32_DP2 @@ -149,6 +168,7 @@ function llm_qwen_case_list_auto() { llm_qwen_dygraph_auto_bs1_fp32_DP2-MP2-PP2 llm_qwen_dygraph_auto_bs1_bf16_DP2-MP2-PP2 ) + executable_fun_list $fun_list_origin if [ $1 = "prepare_case" ]; then restore_func $fun_list elif [ $1 = "exec_case" ]; then diff --git a/scripts/distribute/ci_case_dy.sh b/scripts/distribute/ci_case_dy.sh index 13329a52b32c..59dcbdf6ffda 100644 --- a/scripts/distribute/ci_case_dy.sh +++ b/scripts/distribute/ci_case_dy.sh @@ -69,8 +69,26 @@ function restore_func() { done } +function executable_fun_list() { + fun_list_origin=$1 + fun_list=() + if [ ! -f "$root_path/blacklist.csv" ];then + wget -P $root_path/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 + fi + mapfile -t blacklist < $root_path/blacklist.csv + for fun in "${fun_list_origin[@]}"; do + # 检查函数是否在黑名单中 + if [[ ! " ${blacklist[@]} " == *" $fun "* ]]; then + # 如果不在黑名单中,添加到可执行函数列表 + fun_list+=("$fun") + else + echo "$fun is in the blacklist. Not added to executable list." + fi + done +} + function gpt_case_list_dygraph() { - fun_list=( + fun_list_origin=( # The test name must have "gpt_" as a prefix, which will # be used for tracking the execution status of the case. gpt_preprocess_data @@ -96,6 +114,7 @@ function gpt_case_list_dygraph() { gpt_eval_WikiText gpt_eval_LAMBADA ) + executable_fun_list $fun_list_origin if [ $1 = "prepare_case" ]; then restore_func $fun_list elif [ $1 = "exec_case" ]; then @@ -110,11 +129,12 @@ function gpt_case_list_dygraph() { } function llm_gpt_case_list_dygraph() { - fun_list=( + fun_list_origin=( # The test name must have "llm_gpt_" as a prefix, which will # be used for tracking the execution status of the case. llm_gpt_recompute_bs32_bf16_MP2-SD4-stage1 ) + executable_fun_list $fun_list_origin if [ $1 = "prepare_case" ]; then restore_func $fun_list elif [ $1 = "exec_case" ]; then diff --git a/scripts/distribute/run_ci.sh b/scripts/distribute/run_ci.sh index 722173caba56..a8e36fb87edf 100644 --- a/scripts/distribute/run_ci.sh +++ b/scripts/distribute/run_ci.sh @@ -220,6 +220,8 @@ if [[ ${#case_list[*]} -ne 0 ]];then install_paddlenlp # Install external_ops install_external_ops + # wget blacklist + wget -P $root_path/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 case_num=1 export FLAGS_install_deps=0 From 22d76c957a92fce34c2f02f8a40b735a0dcf1832 Mon Sep 17 00:00:00 2001 From: liujie44 Date: Mon, 9 Dec 2024 00:12:53 +0800 Subject: [PATCH 2/7] update --- scripts/distribute/ci_case_auto.sh | 18 ++++++++++-------- scripts/distribute/ci_case_dy.sh | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/scripts/distribute/ci_case_auto.sh b/scripts/distribute/ci_case_auto.sh index 16946bf74727..551231c61c81 100755 --- a/scripts/distribute/ci_case_auto.sh +++ b/scripts/distribute/ci_case_auto.sh @@ -86,14 +86,16 @@ function executable_fun_list() { if [ ! -f "$root_path/blacklist.csv" ];then wget -P $root_path/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 fi - mapfile -t blacklist < $root_path/blacklist.csv - for fun in "${fun_list_origin[@]}"; do - # 检查函数是否在黑名单中 - if [[ ! " ${blacklist[@]} " == *" $fun "* ]]; then - # 如果不在黑名单中,添加到可执行函数列表 - fun_list+=("$fun") - else - echo "$fun is in the blacklist. Not added to executable list." + blacklist_file=$root_path/blacklist.csv + declare -A blacklist_map + while IFS= read -r blacklist_item; do + blacklist_item=$(echo "$blacklist_item" | xargs) + blacklist_map["$blacklist_item"]=true + done < "$blacklist_file" + echo $blacklist_map + for item in "${fun_list_origin[@]}"; do + if [[ -z "${blacklist_map[$item]}" ]]; then + fun_list+=("$item") fi done } diff --git a/scripts/distribute/ci_case_dy.sh b/scripts/distribute/ci_case_dy.sh index 59dcbdf6ffda..98861942d233 100644 --- a/scripts/distribute/ci_case_dy.sh +++ b/scripts/distribute/ci_case_dy.sh @@ -75,14 +75,16 @@ function executable_fun_list() { if [ ! -f "$root_path/blacklist.csv" ];then wget -P $root_path/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 fi - mapfile -t blacklist < $root_path/blacklist.csv - for fun in "${fun_list_origin[@]}"; do - # 检查函数是否在黑名单中 - if [[ ! " ${blacklist[@]} " == *" $fun "* ]]; then - # 如果不在黑名单中,添加到可执行函数列表 - fun_list+=("$fun") - else - echo "$fun is in the blacklist. Not added to executable list." + blacklist_file=$root_path/blacklist.csv + declare -A blacklist_map + while IFS= read -r blacklist_item; do + blacklist_item=$(echo "$blacklist_item" | xargs) + blacklist_map["$blacklist_item"]=true + done < "$blacklist_file" + echo $blacklist_map + for item in "${fun_list_origin[@]}"; do + if [[ -z "${blacklist_map[$item]}" ]]; then + fun_list+=("$item") fi done } From d0b133e8fe1b1c87276626a352519dd1da09d55e Mon Sep 17 00:00:00 2001 From: liujie44 Date: Mon, 16 Dec 2024 13:12:27 +0800 Subject: [PATCH 3/7] update --- scripts/distribute/ci_case_auto.sh | 25 +++++++++++-------------- scripts/distribute/ci_case_dy.sh | 27 +++++++++++---------------- scripts/distribute/run_ci.sh | 5 +---- 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/scripts/distribute/ci_case_auto.sh b/scripts/distribute/ci_case_auto.sh index 9dc26f58de9b..db1abc236b82 100755 --- a/scripts/distribute/ci_case_auto.sh +++ b/scripts/distribute/ci_case_auto.sh @@ -75,27 +75,24 @@ function restore_func() { rm "functions.txt" echo "Deleted existing functions.txt" fi - for function in ${fun_list[@]};do - echo "$function" >> functions.txt - done -} - -function executable_fun_list() { - fun_list_origin=$1 - fun_list=() - if [ ! -f "$root_path/blacklist.csv" ];then - wget -P $root_path/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 + if [ -e "blacklist.csv" ]; then + rm "blacklist.csv" + # wget blacklist + wget -P ${log_path}/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 + echo "Deleted existing blacklist.csv and wget new blacklist.csv" fi - blacklist_file=$root_path/blacklist.csv + blacklist_file=./blacklist.csv declare -A blacklist_map while IFS= read -r blacklist_item; do blacklist_item=$(echo "$blacklist_item" | xargs) blacklist_map["$blacklist_item"]=true done < "$blacklist_file" - echo $blacklist_map - for item in "${fun_list_origin[@]}"; do + echo "blacklist: $blacklist_map" + for function in ${fun_list[@]};do if [[ -z "${blacklist_map[$item]}" ]]; then - fun_list+=("$item") + echo "$function" >> functions.txt + else + echo "skip blacklist case: $function" fi done } diff --git a/scripts/distribute/ci_case_dy.sh b/scripts/distribute/ci_case_dy.sh index ce539b9cd040..f77f5a3e63cf 100644 --- a/scripts/distribute/ci_case_dy.sh +++ b/scripts/distribute/ci_case_dy.sh @@ -64,27 +64,24 @@ function restore_func() { rm "functions.txt" echo "Deleted existing functions.txt" fi - for function in ${fun_list[@]};do - echo "$function" >> functions.txt - done -} - -function executable_fun_list() { - fun_list_origin=$1 - fun_list=() - if [ ! -f "$root_path/blacklist.csv" ];then - wget -P $root_path/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 + if [ -e "blacklist.csv" ]; then + rm "blacklist.csv" + # wget blacklist + wget -P ${log_path}/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 + echo "Deleted existing blacklist.csv and wget new blacklist.csv" fi - blacklist_file=$root_path/blacklist.csv + blacklist_file=./blacklist.csv declare -A blacklist_map while IFS= read -r blacklist_item; do blacklist_item=$(echo "$blacklist_item" | xargs) blacklist_map["$blacklist_item"]=true done < "$blacklist_file" - echo $blacklist_map - for item in "${fun_list_origin[@]}"; do + echo "blacklist: $blacklist_map" + for function in ${fun_list[@]};do if [[ -z "${blacklist_map[$item]}" ]]; then - fun_list+=("$item") + echo "$function" >> functions.txt + else + echo "skip blacklist case: $function" fi done } @@ -116,7 +113,6 @@ function gpt_case_list_dygraph() { gpt_eval_WikiText gpt_eval_LAMBADA ) - executable_fun_list $fun_list_origin if [ $1 = "prepare_case" ]; then restore_func $fun_list elif [ $1 = "exec_case" ]; then @@ -136,7 +132,6 @@ function llm_gpt_case_list_dygraph() { # be used for tracking the execution status of the case. llm_gpt_recompute_bs32_bf16_MP2-SD4-stage1 ) - executable_fun_list $fun_list_origin if [ $1 = "prepare_case" ]; then restore_func $fun_list elif [ $1 = "exec_case" ]; then diff --git a/scripts/distribute/run_ci.sh b/scripts/distribute/run_ci.sh index aed382d8460f..c5d5de02c06b 100644 --- a/scripts/distribute/run_ci.sh +++ b/scripts/distribute/run_ci.sh @@ -246,10 +246,7 @@ if [[ ${#case_list[*]} -ne 0 ]];then # Install paddlenlp install_paddlenlp # Install external_ops - install_external_ops - # wget blacklist - wget -P $root_path/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 - + install_external_ops case_num=1 export FLAGS_install_deps=0 export FLAGS_download_data="" From f2566f73172a3dc9bea3e3f3c96e40dc9837c113 Mon Sep 17 00:00:00 2001 From: liujie44 Date: Mon, 16 Dec 2024 14:51:52 +0800 Subject: [PATCH 4/7] update --- scripts/distribute/ci_case_auto.sh | 9 +++------ scripts/distribute/ci_case_dy.sh | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/distribute/ci_case_auto.sh b/scripts/distribute/ci_case_auto.sh index db1abc236b82..14a8e4349abf 100755 --- a/scripts/distribute/ci_case_auto.sh +++ b/scripts/distribute/ci_case_auto.sh @@ -100,7 +100,7 @@ function restore_func() { # NOTE: Please place the new tests as much as possible after the existing tests function llama_case_list_auto() { - fun_list_origin=( + fun_list=( # The test name must have "llama_" as a prefix, which will # be used for tracking the execution status of the case. llama_dygraph_auto_bs8_fp32_DP2 @@ -120,7 +120,6 @@ function llama_case_list_auto() { llama_baichuan_pir_auto_fuse_ffn_attention_qkv_DP2_MP2_PP2 llama_dy2st_auto_bs2_bf16_DP2-MP1-PP1-CINN ) - executable_fun_list $fun_list_origin if [ $1 = "prepare_case" ]; then restore_func $fun_list elif [ $1 = "exec_case" ]; then @@ -136,7 +135,7 @@ function llama_case_list_auto() { function llm_gpt_case_list_auto() { - fun_list_origin=( + fun_list=( # The test name must have "llm_gpt_dygraph_auto_" as a prefix, # which will be used for tracking the execution status of the case. llm_gpt_dygraph_auto_bs8_fp32_DP2 @@ -147,7 +146,6 @@ function llm_gpt_case_list_auto() { llm_gpt_pir_auto_bs4_TP2_PP2 llm_gpt_pir_auto_bs8_DP2_TP2_PP2 ) - executable_fun_list $fun_list_origin if [ $1 = "prepare_case" ]; then restore_func $fun_list elif [ $1 = "exec_case" ]; then @@ -162,7 +160,7 @@ function llm_gpt_case_list_auto() { } function llm_qwen_case_list_auto() { - fun_list_origin=( + fun_list=( # The test name must have "llm_qwen_dygraph_auto_" as a prefix, # which will be used for tracking the execution status of the case. llm_qwen_dygraph_auto_bs1_fp32_DP2 @@ -172,7 +170,6 @@ function llm_qwen_case_list_auto() { llm_qwen_pir_auto_bs1_bf16_TP2 llm_qwen_pir_auto_bs1_bf16_TP2_PP2 ) - executable_fun_list $fun_list_origin if [ $1 = "prepare_case" ]; then restore_func $fun_list elif [ $1 = "exec_case" ]; then diff --git a/scripts/distribute/ci_case_dy.sh b/scripts/distribute/ci_case_dy.sh index f77f5a3e63cf..6192d9f18b04 100644 --- a/scripts/distribute/ci_case_dy.sh +++ b/scripts/distribute/ci_case_dy.sh @@ -87,7 +87,7 @@ function restore_func() { } function gpt_case_list_dygraph() { - fun_list_origin=( + fun_list=( # The test name must have "gpt_" as a prefix, which will # be used for tracking the execution status of the case. gpt_preprocess_data @@ -127,7 +127,7 @@ function gpt_case_list_dygraph() { } function llm_gpt_case_list_dygraph() { - fun_list_origin=( + fun_list=( # The test name must have "llm_gpt_" as a prefix, which will # be used for tracking the execution status of the case. llm_gpt_recompute_bs32_bf16_MP2-SD4-stage1 From 10cbb268838af155d2eb58f44a848f39ef9ada43 Mon Sep 17 00:00:00 2001 From: liujie44 Date: Mon, 16 Dec 2024 15:47:22 +0800 Subject: [PATCH 5/7] update --- scripts/distribute/ci_case_auto.sh | 12 +++++------- scripts/distribute/ci_case_dy.sh | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/scripts/distribute/ci_case_auto.sh b/scripts/distribute/ci_case_auto.sh index 14a8e4349abf..70359d2bcaf5 100755 --- a/scripts/distribute/ci_case_auto.sh +++ b/scripts/distribute/ci_case_auto.sh @@ -75,24 +75,22 @@ function restore_func() { rm "functions.txt" echo "Deleted existing functions.txt" fi - if [ -e "blacklist.csv" ]; then - rm "blacklist.csv" - # wget blacklist + if [ ! -f "${log_path}/blacklist.csv" ]; then wget -P ${log_path}/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 - echo "Deleted existing blacklist.csv and wget new blacklist.csv" + echo "\033 ---- wget blacklist.csv \033" fi - blacklist_file=./blacklist.csv + blacklist_file=${log_path}/blacklist.csv declare -A blacklist_map while IFS= read -r blacklist_item; do blacklist_item=$(echo "$blacklist_item" | xargs) blacklist_map["$blacklist_item"]=true done < "$blacklist_file" - echo "blacklist: $blacklist_map" + echo "\033 ---- blacklist: $blacklist_map \033" for function in ${fun_list[@]};do if [[ -z "${blacklist_map[$item]}" ]]; then echo "$function" >> functions.txt else - echo "skip blacklist case: $function" + echo "\033 ---- skip blacklist case: $function \033" fi done } diff --git a/scripts/distribute/ci_case_dy.sh b/scripts/distribute/ci_case_dy.sh index 6192d9f18b04..d6cadec738f3 100644 --- a/scripts/distribute/ci_case_dy.sh +++ b/scripts/distribute/ci_case_dy.sh @@ -64,24 +64,22 @@ function restore_func() { rm "functions.txt" echo "Deleted existing functions.txt" fi - if [ -e "blacklist.csv" ]; then - rm "blacklist.csv" - # wget blacklist + if [ ! -f "${log_path}/blacklist.csv" ]; then wget -P ${log_path}/ https://paddle-qa.bj.bcebos.com/Auto-Parallel/blacklist.csv --no-proxy || exit 101 - echo "Deleted existing blacklist.csv and wget new blacklist.csv" + echo "\033 ---- wget blacklist.csv \033" fi - blacklist_file=./blacklist.csv + blacklist_file=${log_path}/blacklist.csv declare -A blacklist_map while IFS= read -r blacklist_item; do blacklist_item=$(echo "$blacklist_item" | xargs) blacklist_map["$blacklist_item"]=true done < "$blacklist_file" - echo "blacklist: $blacklist_map" + echo "\033 ---- blacklist: $blacklist_map \033" for function in ${fun_list[@]};do if [[ -z "${blacklist_map[$item]}" ]]; then echo "$function" >> functions.txt else - echo "skip blacklist case: $function" + echo "\033 ---- skip blacklist case: $function \033" fi done } From 9694ee2e8096f0b3c974cc3ac3f16902fa9c6c8e Mon Sep 17 00:00:00 2001 From: liujie44 Date: Tue, 17 Dec 2024 17:00:21 +0800 Subject: [PATCH 6/7] fix --- scripts/distribute/ci_case_auto.sh | 13 ++++--------- scripts/distribute/ci_case_dy.sh | 13 ++++--------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/scripts/distribute/ci_case_auto.sh b/scripts/distribute/ci_case_auto.sh index 70359d2bcaf5..beff4f05c23f 100755 --- a/scripts/distribute/ci_case_auto.sh +++ b/scripts/distribute/ci_case_auto.sh @@ -80,17 +80,12 @@ function restore_func() { echo "\033 ---- wget blacklist.csv \033" fi blacklist_file=${log_path}/blacklist.csv - declare -A blacklist_map - while IFS= read -r blacklist_item; do - blacklist_item=$(echo "$blacklist_item" | xargs) - blacklist_map["$blacklist_item"]=true - done < "$blacklist_file" - echo "\033 ---- blacklist: $blacklist_map \033" + mapfile -t blacklist < "$blacklist_file" for function in ${fun_list[@]};do - if [[ -z "${blacklist_map[$item]}" ]]; then - echo "$function" >> functions.txt + if [[ " ${blacklist[@]} " == *" ${function} "* ]]; then + echo "Function '$function' is blacklisted and will be skipped." else - echo "\033 ---- skip blacklist case: $function \033" + echo "$function" >> functions.txt fi done } diff --git a/scripts/distribute/ci_case_dy.sh b/scripts/distribute/ci_case_dy.sh index d6cadec738f3..139b8f60015b 100644 --- a/scripts/distribute/ci_case_dy.sh +++ b/scripts/distribute/ci_case_dy.sh @@ -69,17 +69,12 @@ function restore_func() { echo "\033 ---- wget blacklist.csv \033" fi blacklist_file=${log_path}/blacklist.csv - declare -A blacklist_map - while IFS= read -r blacklist_item; do - blacklist_item=$(echo "$blacklist_item" | xargs) - blacklist_map["$blacklist_item"]=true - done < "$blacklist_file" - echo "\033 ---- blacklist: $blacklist_map \033" + mapfile -t blacklist < "$blacklist_file" for function in ${fun_list[@]};do - if [[ -z "${blacklist_map[$item]}" ]]; then - echo "$function" >> functions.txt + if [[ " ${blacklist[@]} " == *" ${function} "* ]]; then + echo ""\033 ---- Function '$function' is blacklisted and will be skipped. \033" else - echo "\033 ---- skip blacklist case: $function \033" + echo "$function" >> functions.txt fi done } From fccbfa70233f1c982624d032d0992677abaa83f5 Mon Sep 17 00:00:00 2001 From: liujie44 Date: Thu, 19 Dec 2024 14:33:37 +0800 Subject: [PATCH 7/7] fix --- scripts/distribute/ci_case_auto.sh | 2 +- scripts/distribute/ci_case_dy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/distribute/ci_case_auto.sh b/scripts/distribute/ci_case_auto.sh index beff4f05c23f..36155955db71 100755 --- a/scripts/distribute/ci_case_auto.sh +++ b/scripts/distribute/ci_case_auto.sh @@ -83,7 +83,7 @@ function restore_func() { mapfile -t blacklist < "$blacklist_file" for function in ${fun_list[@]};do if [[ " ${blacklist[@]} " == *" ${function} "* ]]; then - echo "Function '$function' is blacklisted and will be skipped." + echo "\033 ---- Function '$function' is blacklisted and will be skipped. \033" else echo "$function" >> functions.txt fi diff --git a/scripts/distribute/ci_case_dy.sh b/scripts/distribute/ci_case_dy.sh index 139b8f60015b..f2926c792173 100644 --- a/scripts/distribute/ci_case_dy.sh +++ b/scripts/distribute/ci_case_dy.sh @@ -72,7 +72,7 @@ function restore_func() { mapfile -t blacklist < "$blacklist_file" for function in ${fun_list[@]};do if [[ " ${blacklist[@]} " == *" ${function} "* ]]; then - echo ""\033 ---- Function '$function' is blacklisted and will be skipped. \033" + echo "\033 ---- Function '$function' is blacklisted and will be skipped. \033" else echo "$function" >> functions.txt fi