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

test/packaging: Export LD_LIBRARY_PATH, PKG_CONFIG_PATH setup

Browse Source 
095f40630e 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: Michal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17576
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Kamil Godzwon <kamilx.godzwon@intel.com>
This commit is contained in:
Michal Berger 2023-04-15 19:53:49 +02:00 committed by David Ko
parent 5ff8838dda
commit f28978a106
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/common/autobuild_common.sh
View File

@ -210,7 +210,10 @@ _build_native_dpdk() {
# Save this path. In tests are run using autorun.sh then autotest.sh # 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. # 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" cd "$orgdir"
} }

2
test/packaging/rpm/rpm.sh
View File

@ -93,6 +93,8 @@ build_rpm_from_gen_spec() {
} }
build_shared_native_dpdk_rpm() { 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" build_rpm --with-shared --with-dpdk="$SPDK_RUN_EXTERNAL_DPDK"
} }