From a33a7b44a3079bcf9c8ae18d9013092643f1c7e8 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Tue, 26 Jun 2018 12:58:23 -0700 Subject: [PATCH] test/config: minor error fixes to vm_setup.sh The name of the rpm source for open-iscsi changes between fedora releases. Also, there was a typo on the tsocks check. Change-Id: I0f9810c51c35c3efd5616fad303d08b02d9e2218 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/416882 Reviewed-by: Daniel Verkamp Reviewed-by: Ben Walker Tested-by: SPDK Automated Test System --- test/common/config/vm_setup.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index 4e9da9cf67..6d510cf674 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -43,6 +43,7 @@ cd ~ sudo dnf install -y jq +sudo dnf install -y tsocks sudo dnf install -y valgrind sudo dnf install -y nvme-cli sudo dnf install -y ceph @@ -95,7 +96,7 @@ if [ "$CURRENT_VERSION" == "$OPEN_ISCSI_VER" ]; then mkdir -p open-iscsi-install cd open-iscsi-install sudo dnf download --source iscsi-initiator-utils - rpm2cpio iscsi-initiator-utils-6.2.0.874-3.git86e8892.fc26.src.rpm | cpio -idmv + rpm2cpio $(ls) | cpio -idmv mkdir -p patches mv 00* patches/ git clone https://github.com/open-iscsi/open-iscsi @@ -167,7 +168,7 @@ else echo "qemu already checked out. Skipping" fi cd "$SPDK_QEMU_BRANCH" -if hash tsocks &> /dev/null; then +if hash tsocks 2> /dev/null; then git_param="--with-git='tsocks git'" fi ./configure "$git_param" --prefix=/usr/local/qemu/$SPDK_QEMU_BRANCH --target-list="x86_64-softmmu" --enable-kvm --enable-linux-aio --enable-numa