From ac021a2e7db7c0fb8036f03f4df04f6d7d096475 Mon Sep 17 00:00:00 2001
From: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Date: Wed, 27 Dec 2017 16:29:03 +0100
Subject: [PATCH] test/vhost: make FIO be configurable through env variable

Change-Id: I45b366ed39964514a8d409fe894ca941e8895b73
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/393057
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
---
 test/vhost/spdk_vhost.sh | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/test/vhost/spdk_vhost.sh b/test/vhost/spdk_vhost.sh
index 509296b16..857062b16 100755
--- a/test/vhost/spdk_vhost.sh
+++ b/test/vhost/spdk_vhost.sh
@@ -3,6 +3,7 @@
 set -e
 
 DEFAULT_VM_IMAGE="/home/sys_sgsw/vhost_vm_image.qcow2"
+DEFAULT_FIO_BIN="/home/sys_sgsw/fio_ubuntu"
 
 case $1 in
 	-h|--help)
@@ -37,8 +38,8 @@ if [[ $(uname -s) != Linux ]]; then
 	exit 0
 fi
 
-
 : ${VM_IMAGE="$DEFAULT_VM_IMAGE"}
+: ${FIO_BIN="$DEFAULT_FIO_BIN"}
 
 if [[ ! -r "${VM_IMAGE}" ]]; then
 	echo ""
@@ -54,36 +55,34 @@ case $1 in
 	-n|--negative)
 		echo 'Negative tests suite...'
 		./other/negative.sh
-	;;
+		;;
 	-p|--performance)
 		echo 'Running performance suite...'
-		./fiotest/autotest.sh --fio-bin=/home/sys_sgsw/fio_ubuntu \
+		./fiotest/autotest.sh --fio-bin=$FIO_BIN \
 		--vm=0,$VM_IMAGE,Nvme0n1p0 \
 		--test-type=spdk_vhost_scsi \
 		--fio-job=$WORKDIR/common/fio_jobs/default_performance.job
-	;;
+		;;
 	-pb|--performance-blk)
 		echo 'Running blk performance suite...'
-		./fiotest/autotest.sh --fio-bin=/home/sys_sgsw/fio_ubuntu \
+		./fiotest/autotest.sh --fio-bin=$FIO_BIN \
 		--vm=0,$VM_IMAGE,Nvme0n1p0 \
 		--test-type=spdk_vhost_blk \
 		--fio-job=$WORKDIR/common/fio_jobs/default_performance.job
 		;;
 	-i|--integrity)
 		echo 'Running SCSI integrity suite...'
-		./fiotest/autotest.sh --fio-bin=/home/sys_sgsw/fio_ubuntu \
+		./fiotest/autotest.sh -x --fio-bin=$FIO_BIN \
 		--vm=0,$VM_IMAGE,Nvme0n1p0:Nvme0n1p1:Nvme0n1p2:Nvme0n1p3 \
 		--test-type=spdk_vhost_scsi \
-		--fio-job=$WORKDIR/common/fio_jobs/default_integrity.job \
-		-x
+		--fio-job=$WORKDIR/common/fio_jobs/default_integrity.job
 		;;
 	-ib|--integrity-blk)
 		echo 'Running blk integrity suite...'
-		./fiotest/autotest.sh --fio-bin=/home/sys_sgsw/fio_ubuntu \
+		./fiotest/autotest.sh -x --fio-bin=$FIO_BIN \
 		--vm=0,$VM_IMAGE,Nvme0n1p0:Nvme0n1p1:Nvme0n1p2:Nvme0n1p3 \
 		--test-type=spdk_vhost_blk \
-		--fio-job=$WORKDIR/common/fio_jobs/default_integrity.job \
-		-x
+		--fio-job=$WORKDIR/common/fio_jobs/default_integrity.job
 		;;
 	-fs|--fs-integrity-scsi)
 		echo 'Running filesystem integrity suite...'
@@ -95,17 +94,17 @@ case $1 in
 		;;
 	-ils|--integrity-lvol-scsi)
 		echo 'Running lvol integrity suite...'
-		./lvol/lvol_test.sh -x --fio-bin=/home/sys_sgsw/fio_ubuntu \
+		./lvol/lvol_test.sh -x --fio-bin=$FIO_BIN \
 		--ctrl-type=vhost_scsi
 		;;
 	-ilb|--integrity-lvol-blk)
 		echo 'Running lvol integrity suite...'
-		./lvol/lvol_test.sh -x --fio-bin=/home/sys_sgsw/fio_ubuntu \
+		./lvol/lvol_test.sh -x --fio-bin=$FIO_BIN \
 		--ctrl-type=vhost_blk
 		;;
 	-hp|--hotplug)
 		echo 'Running hotplug tests suite...'
-		./hotplug/scsi_hotplug.sh --fio-bin=/home/sys_sgsw/fio_ubuntu \
+		./hotplug/scsi_hotplug.sh --fio-bin=$FIO_BIN \
 			--vm=0,$VM_IMAGE,Nvme0n1p0:Nvme0n1p1 \
 			--vm=1,$VM_IMAGE,Nvme0n1p2:Nvme0n1p3 \
 			--vm=2,$VM_IMAGE,Nvme0n1p4:Nvme0n1p5 \