Commit 6a4b6784 authored by Michal Berger's avatar Michal Berger Committed by Jim Harris
Browse files

test/autobuild: Source $spdk_conf before autotest_common.sh 



This is to make sure we export all SPDK_* with proper values.

Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Change-Id: I2f01af1a051edcec6a75f99b25b765080abf2a5d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17212


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 535543d4

autobuild.sh

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 


rootdir=$(readlink -f $(dirname $0))



source "$1"

source "$rootdir/test/common/autobuild_common.sh"



SPDK_TEST_AUTOBUILD=${SPDK_TEST_AUTOBUILD:-}

test/common/autobuild_common.sh

+8 −7
Original line number Diff line number Diff line
@@ -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