From 108c00bd687c6cbd626b23599e642f77cf617d67 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 1 Jun 2017 13:11:08 -0700 Subject: [PATCH] test/iscsi_tgt/ext4test: update for DPDK submodule Copy the DPDK submodule and re-run configure so that ext4test works regardless of whether the autotest agent is using the submodule or the hard-coded /usr/local/share/dpdk path. This reverts commit f21448cf (test/iscsi: do not rsync dpdk directory for ext4test) since the DPDK submodule is now needed to build. Change-Id: Ib08c19bf7a6c3cbb450a4f613168bdab529ba9aa Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/363460 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker --- test/iscsi_tgt/ext4test/ext4test.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh index bbbbb49b6..d289e4de6 100755 --- a/test/iscsi_tgt/ext4test/ext4test.sh +++ b/test/iscsi_tgt/ext4test/ext4test.sh @@ -90,10 +90,11 @@ for dev in $devs; do mkdir -p /mnt/${dev}dir mount -o sync /dev/$dev /mnt/${dev}dir - rsync -qav --exclude=".git" --exclude="dpdk" $rootdir/ /mnt/${dev}dir/spdk + rsync -qav --exclude=".git" $rootdir/ /mnt/${dev}dir/spdk - make -C /mnt/${dev}dir/spdk DPDK_DIR=$DPDK_DIR clean - make -C /mnt/${dev}dir/spdk DPDK_DIR=$DPDK_DIR -j16 + make -C /mnt/${dev}dir/spdk clean + (cd /mnt/${dev}dir/spdk && ./configure $config_params) + make -C /mnt/${dev}dir/spdk -j16 # Print out space consumed on target device to help decide # if/when we need to increase the size of the malloc LUN