ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autobuild: Move .conf check to autobuild_common

Browse Source 
Also, keep it in global scope as $spdk_conf rather than passing it
as a positional argument to whatever routine that may depend on it.

Signed-off-by: Michal Berger <michal.berger@intel.com>
Change-Id: I68532d5848e0bd7ee8519ef3e308b24ab6a38876
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15724
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Kamil Godzwon <kamilx.godzwon@intel.com>
This commit is contained in:
Michal Berger 2022-11-30 16:51:17 +01:00 committed by Tomasz Zawadzki
parent 2bd4ba6e70
commit 88f8a6ca22
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.sh
View File

@ -6,12 +6,6 @@
set -e set -e
# If the configuration of tests is not provided, no tests will be carried out.
if [[ ! -f $1 ]]; then
echo "ERROR: SPDK test configuration not specified"
exit 1
fi
rootdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $(dirname $0))
source "$1" source "$1"
@ -62,7 +56,7 @@ if [[ $SPDK_TEST_FUZZER -eq 1 ]]; then
fi fi
if [[ -n $SPDK_TEST_AUTOBUILD ]]; then if [[ -n $SPDK_TEST_AUTOBUILD ]]; then
run_test "autobuild" autobuild_test_suite $1 run_test "autobuild" autobuild_test_suite
elif [[ $SPDK_TEST_UNITTEST -eq 1 ]]; then elif [[ $SPDK_TEST_UNITTEST -eq 1 ]]; then
run_test "unittest_build" unittest_build run_test "unittest_build" unittest_build
elif [[ $SPDK_TEST_SCANBUILD -eq 1 ]]; then elif [[ $SPDK_TEST_SCANBUILD -eq 1 ]]; then

17
test/common/autobuild_common.sh
View File

@ -331,7 +331,7 @@ check_format() {
} }
check_so_deps() { check_so_deps() {
run_test "autobuild_check_so_deps" "$rootdir/test/make/check_so_deps.sh" "$1" run_test "autobuild_check_so_deps" "$rootdir/test/make/check_so_deps.sh" "$spdk_conf"
} }
external_code() { external_code() {
@ -358,7 +358,7 @@ build_doc() {
autobuild_test_suite_tiny() { autobuild_test_suite_tiny() {
check_format check_format
check_so_deps "$1" check_so_deps
dpdk_pci_api dpdk_pci_api
} }
@ -367,7 +367,7 @@ autobuild_test_suite_ext() {
} }
autobuild_test_suite_full() { autobuild_test_suite_full() {
autobuild_test_suite_tiny "$1" autobuild_test_suite_tiny
autobuild_test_suite_ext autobuild_test_suite_ext
build_files build_files
build_doc build_doc
@ -375,9 +375,9 @@ autobuild_test_suite_full() {
autobuild_test_suite() { autobuild_test_suite() {
case "$SPDK_TEST_AUTOBUILD" in case "$SPDK_TEST_AUTOBUILD" in
tiny) autobuild_test_suite_tiny "$1" ;; tiny) autobuild_test_suite_tiny ;;
ext) autobuild_test_suite_ext ;; ext) autobuild_test_suite_ext ;;
full) autobuild_test_suite_full "$1" ;; full) autobuild_test_suite_full ;;
esac esac
} }
@ -404,3 +404,10 @@ scanbuild_exclude+=" --exclude $rootdir/xnvme --exclude /tmp"
scanbuild="scan-build -o $output_dir/scan-build-tmp $scanbuild_exclude --status-bugs" scanbuild="scan-build -o $output_dir/scan-build-tmp $scanbuild_exclude --status-bugs"
config_params=$(get_config_params) config_params=$(get_config_params)
spdk_conf=${spdk_conf:-"$1"}
if [[ ! -f $spdk_conf ]]; then
echo "ERROR: SPDK test configuration not specified"
return 1
fi