Skip to content

Commit

Permalink
test/packaging: Export LD_LIBRARY_PATH, PKG_CONFIG_PATH setup
Browse files Browse the repository at this point in the history
095f406 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 <[email protected]>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17576
Reviewed-by: Karol Latecki <[email protected]>
Reviewed-by: Jim Harris <[email protected]>
Tested-by: SPDK CI Jenkins <[email protected]>
Reviewed-by: Konrad Sztyber <[email protected]>
Reviewed-by: Kamil Godzwon <[email protected]>
  • Loading branch information
mikeBashStuff authored and ksztyber committed Apr 18, 2023
1 parent 6732946 commit fc0214d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 4 additions & 1 deletion test/common/autobuild_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 2 additions & 0 deletions test/packaging/rpm/rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down

0 comments on commit fc0214d

Please sign in to comment.