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 <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/416882
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Seth Howell 2018-06-26 12:58:23 -07:00 committed by Daniel Verkamp
parent dfe497c27b
commit a33a7b44a3

View File

@ -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