From 097e6e16b9580218e308ca5f90cf66478e127c28 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Thu, 29 Oct 2020 09:53:42 +0100 Subject: [PATCH] nvme/hotplug.sh: Copy external DPDK libs into test VM Need to select proper path for passing libs into the VM in case we're building with custom DPDK. Signed-off-by: Karol Latecki Change-Id: I97d301c70adee31b727c6b6673eadac3cbde9817 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4975 Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- test/nvme/hotplug.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/nvme/hotplug.sh b/test/nvme/hotplug.sh index f032b54e4..8563405a4 100755 --- a/test/nvme/hotplug.sh +++ b/test/nvme/hotplug.sh @@ -96,7 +96,15 @@ files_to_copy="scripts " files_to_copy+="include/spdk/pci_ids.h " files_to_copy+="build/examples/hotplug " files_to_copy+="build/lib " -files_to_copy+="dpdk/build/lib " + +# Select which dpdk libs to copy in case we're not building with +# spdk/dpdk submodule +if [[ -n "$SPDK_RUN_EXTERNAL_DPDK" ]]; then + files_to_copy+="-C $SPDK_RUN_EXTERNAL_DPDK/../.. dpdk/build/lib" +else + files_to_copy+="dpdk/build/lib " +fi + ( cd "$rootdir" tar -cf - $files_to_copy