From c522804126ad2f551ce48ac21e0fc953f3988b0c Mon Sep 17 00:00:00 2001
From: Tomasz Rochumski <tomasz.rochumski@intel.com>
Date: Tue, 17 Aug 2021 13:46:25 +0000
Subject: [PATCH] test_make.sh: make configure respect SPDK_RUN_EXTERNAL_DPDK

Fixes issue #2042.

Signed-off-by: Tomasz Rochumski <tomasz.rochumski@intel.com>
Change-Id: Ied1fcda8cf449ba53b16fb56f3451b566c1fc9d4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9202
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
---
 test/external_code/test_make.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/external_code/test_make.sh b/test/external_code/test_make.sh
index 23be4dba3..30beb01c9 100755
--- a/test/external_code/test_make.sh
+++ b/test/external_code/test_make.sh
@@ -14,8 +14,11 @@ fi
 
 sudo HUGEMEM="$EXTERNAL_MAKE_HUGEMEM" $SPDK_DIR/scripts/setup.sh
 
+if [ -n "$SPDK_RUN_EXTERNAL_DPDK" ]; then
+	WITH_DPDK="--with-dpdk=$SPDK_RUN_EXTERNAL_DPDK"
+fi
 make -C $SPDK_DIR clean
-$SPDK_DIR/configure --with-shared --without-isal --without-ocf --disable-asan
+$SPDK_DIR/configure --with-shared --without-isal --without-ocf --disable-asan $WITH_DPDK
 make -C $SPDK_DIR -j$(nproc)
 
 export SPDK_HEADER_DIR="$SPDK_DIR/include"
@@ -57,7 +60,7 @@ run_test "external_run_nvme_shared" $test_root/nvme/identify.sh
 make -C $test_root clean
 
 make -C $SPDK_DIR clean
-$SPDK_DIR/configure --without-shared --without-isal --without-ocf --disable-asan
+$SPDK_DIR/configure --without-shared --without-isal --without-ocf --disable-asan $WITH_DPDK
 make -C $SPDK_DIR -j$(nproc)
 
 # Make both the application and bdev against individual SPDK archives.