From f28978a1066e36ca42087cb1ed1cf337bc81bf25 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Sat, 15 Apr 2023 19:53:49 +0200 Subject: [PATCH] test/packaging: Export LD_LIBRARY_PATH, PKG_CONFIG_PATH setup 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 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17576 Reviewed-by: Karol Latecki Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber Reviewed-by: Kamil Godzwon --- test/common/autobuild_common.sh | 5 ++++- test/packaging/rpm/rpm.sh | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/common/autobuild_common.sh b/test/common/autobuild_common.sh index 2e0cc5cd5..8a448c48a 100755 --- a/test/common/autobuild_common.sh +++ b/test/common/autobuild_common.sh @@ -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" } diff --git a/test/packaging/rpm/rpm.sh b/test/packaging/rpm/rpm.sh index f11ff94d8..cfd056738 100755 --- a/test/packaging/rpm/rpm.sh +++ b/test/packaging/rpm/rpm.sh @@ -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" }