Merged
for test_exclude_kirin #6674
for test_exclude_kirin #6674
Merged
zengjuanAdd on Oct 12
Total: 1 files changed+10-1
Mbuild.sh+10-1
@@ -13,7 +13,7 @@ set -e
13 13 
14SUPPORTED_SHORT_OPTS=("h" "j" "t" "p" "f")14SUPPORTED_SHORT_OPTS=("h" "j" "t" "p" "f")
15SUPPORTED_LONG_OPTS=(15SUPPORTED_LONG_OPTS=(
16- "help" "cov" "cache" "pkg" "pkg-type" "asan" "make_clean" "cann_3rd_lib_path" "test" "cann_path" "adv_test" "adv_test_two" "arm_test" "basic_test_one" "basic_test_two" "basic_test_three" "basic_test_four" "basic_test_five" "build-type" "extra-cmake-args" "changed_file" "enable-sign" "sign-script"16+ "help" "cov" "cache" "pkg" "pkg-type" "asan" "make_clean" "cann_3rd_lib_path" "test" "cann_path" "adv_test" "adv_test_two" "arm_test" "basic_test_one" "basic_test_two" "basic_test_three" "basic_test_four" "basic_test_five" "test_exclude_kirin" "build-type" "extra-cmake-args" "changed_file" "enable-sign" "sign-script"
17)17)
18 18 
19CURRENT_DIR=$(dirname $(readlink -f ${BASH_SOURCE[0]}))19CURRENT_DIR=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
@@ -84,6 +84,7 @@ usage() {
84 echo " --basic_test_three Build and run the basic_three part of unit tests"84 echo " --basic_test_three Build and run the basic_three part of unit tests"
85 echo " --basic_test_four Build and run the basic_four part of unit tests"85 echo " --basic_test_four Build and run the basic_four part of unit tests"
86 echo " --basic_test_five Build and run the basic_five part of unit tests"86 echo " --basic_test_five Build and run the basic_five part of unit tests"
87+ echo " --test_exclude_kirin Build and run all unit tests excluding kirin targets"
87 echo " --cann_3rd_lib_path Set the path for third-party library dependencies, eg: ./build"88 echo " --cann_3rd_lib_path Set the path for third-party library dependencies, eg: ./build"
88 echo " --cov Enable code coverage for unit tests"89 echo " --cov Enable code coverage for unit tests"
89 echo " --asan Enable ASAN (address Sanitizer)"90 echo " --asan Enable ASAN (address Sanitizer)"
@@ -124,6 +125,7 @@ usage() {
124 echo " --basic_test_three Build and run the basic_three part of unit tests"125 echo " --basic_test_three Build and run the basic_three part of unit tests"
125 echo " --basic_test_four Build and run the basic_four part of unit tests"126 echo " --basic_test_four Build and run the basic_four part of unit tests"
126 echo " --basic_test_five Build and run the basic_five part of unit tests"127 echo " --basic_test_five Build and run the basic_five part of unit tests"
128+ echo " --test_exclude_kirin Build and run all unit tests excluding kirin targets"
127 echo " --pkg Compile package"129 echo " --pkg Compile package"
128 echo " --pkg-type=<TYPE> Specify package type (TYPE options: run/rpm/deb/all or comma-separated values, eg: deb,rpm), Default: run"130 echo " --pkg-type=<TYPE> Specify package type (TYPE options: run/rpm/deb/all or comma-separated values, eg: deb,rpm), Default: run"
129 echo " all builds run, rpm and deb packages"131 echo " all builds run, rpm and deb packages"
@@ -242,6 +244,7 @@ check_help_combinations() {
242 --basic_test_three) test_part="basic_test_three" ;;244 --basic_test_three) test_part="basic_test_three" ;;
243 --basic_test_four) test_part="basic_test_four" ;;245 --basic_test_four) test_part="basic_test_four" ;;
244 --basic_test_five) test_part="basic_test_five" ;;246 --basic_test_five) test_part="basic_test_five" ;;
247+ --test_exclude_kirin) test_part="test_exclude_kirin" ;;
245 --cov) has_cov=true ;;248 --cov) has_cov=true ;;
246 --pkg) has_pkg=true ;;249 --pkg) has_pkg=true ;;
247 -h|--help) ;;250 -h|--help) ;;
@@ -308,6 +311,7 @@ check_param_with_help() {
308 --basic_test_three) SHOW_HELP="test" ;;311 --basic_test_three) SHOW_HELP="test" ;;
309 --basic_test_four) SHOW_HELP="test" ;;312 --basic_test_four) SHOW_HELP="test" ;;
310 --basic_test_five) SHOW_HELP="test" ;;313 --basic_test_five) SHOW_HELP="test" ;;
314+ --test_exclude_kirin) SHOW_HELP="test" ;;
311 --make_clean) SHOW_HELP="clean" ;;315 --make_clean) SHOW_HELP="clean" ;;
312 esac316 esac
313 done317 done
@@ -469,6 +473,11 @@ set_options() {
469 check_param_test_part473 check_param_test_part
470 shift474 shift
471 ;;475 ;;
476+ --test_exclude_kirin)
477+ TEST_PART="test_exclude_kirin"
478+ check_param_test_part
479+ shift
480+ ;;
472 --asan)481 --asan)
473 ASAN="true"482 ASAN="true"
474 shift483 shift