test/autobuild: Source $spdk_conf before autotest_common.sh
This is to make sure we export all SPDK_* with proper values. Signed-off-by: Michal Berger <michal.berger@intel.com> Change-Id: I2f01af1a051edcec6a75f99b25b765080abf2a5d Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17212 Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
parent
3a060b6cd5
commit
2099abc819
@ -6,7 +6,6 @@
|
||||
|
||||
rootdir=$(readlink -f $(dirname $0))
|
||||
|
||||
source "$1"
|
||||
source "$rootdir/test/common/autobuild_common.sh"
|
||||
|
||||
SPDK_TEST_AUTOBUILD=${SPDK_TEST_AUTOBUILD:-}
|
||||
|
@ -3,6 +3,14 @@
|
||||
# Copyright (C) 2022 Intel Corporation.
|
||||
# All rights reserved.
|
||||
|
||||
spdk_conf=${spdk_conf:-"$1"}
|
||||
|
||||
if [[ ! -f $spdk_conf ]]; then
|
||||
echo "ERROR: SPDK test configuration not specified"
|
||||
return 1
|
||||
fi
|
||||
|
||||
source "$spdk_conf"
|
||||
source "$rootdir/test/common/autotest_common.sh"
|
||||
source "$rootdir/scripts/common.sh"
|
||||
|
||||
@ -446,10 +454,3 @@ scanbuild_exclude+=" --exclude $rootdir/xnvme --exclude /tmp"
|
||||
|
||||
scanbuild="scan-build -o $output_dir/scan-build-tmp $scanbuild_exclude --status-bugs"
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user