Commit fc0214d5 authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

test/packaging: Export LD_LIBRARY_PATH, PKG_CONFIG_PATH setup 



095f4063 missed the autobuild dependencies while enabling the rpm
test against the external DPDK build. Without it, DPDK is not able
to properly configure itself against ipsec and isa-l libs.

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


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
parent 6732946d

test/common/autobuild_common.sh

+4 −1
Original line number Diff line number Diff line
@@ -210,7 +210,10 @@ _build_native_dpdk() { 


	# Save this path. In tests are run using autorun.sh then autotest.sh

	# script will be unaware of LD_LIBRARY_PATH and will fail tests.

	echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" > /tmp/spdk-ld-path

	cat <<- LD_PATH > /tmp/spdk-ld-path

		export LD_LIBRARY_PATH=$LD_LIBRARY_PATH

		export PKG_CONFIG_PATH=$PKG_CONFIG_PATH

	LD_PATH



	cd "$orgdir"

}

test/packaging/rpm/rpm.sh

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ build_rpm_from_gen_spec() { 
}



build_shared_native_dpdk_rpm() {

	[[ -e /tmp/spdk-ld-path ]] # autobuild dependency

	source /tmp/spdk-ld-path

	build_rpm --with-shared --with-dpdk="$SPDK_RUN_EXTERNAL_DPDK"

}