Commit 86538ffa authored by Karol Latecki's avatar Karol Latecki Committed by Jim Harris
Browse files

test/vhost: remove tee pipe from vhost start command 



Also restoring vhost block tests in autotest.

Change-Id: Idc6a3068650ce28636f4709df5a51029bfddbcdd
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/369470


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent d72ff7f8

autotest.sh

+1 −2
Original line number Diff line number Diff line
@@ -122,8 +122,7 @@ fi 


if [ $SPDK_TEST_VHOST -eq 1 ]; then

	timing_enter vhost

	# Disable integrity-blk for now while the intermittent failures are debugged.

	#run_test ./test/vhost/spdk_vhost.sh --integrity-blk

	run_test ./test/vhost/spdk_vhost.sh --integrity-blk

	run_test ./test/vhost/spdk_vhost.sh --integrity

	timing_exit vhost

fi

test/vhost/fiotest/common.sh

+3 −2
Original line number Diff line number Diff line
@@ -155,10 +155,11 @@ function spdk_vhost_run() 
	echo "INFO: Socket:      $vhost_socket"

	echo "INFO: Command:     $cmd"



	( cd $SPDK_VHOST_SCSI_TEST_DIR; $cmd & echo $! >&3) 3>$vhost_pid_file  2>&1 | tee -a $vhost_log_file &

	cd $SPDK_VHOST_SCSI_TEST_DIR; $cmd &

	vhost_pid=$!

	echo $vhost_pid > $vhost_pid_file



	echo "INFO: waiting for app to run..."

	local vhost_pid="$(cat $vhost_pid_file)"

	waitforlisten "$vhost_pid" ${RPC_PORT}

	echo "INFO: vhost started - pid=$vhost_pid"

test/vhost/spdk_vhost.sh

+4 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ case $param in 
	--vm=0,/home/sys_sgsw/vhost_vm_image.qcow2,Nvme0n1p0:Nvme0n1p1:Nvme0n1p2:Nvme0n1p3 \

	--test-type=spdk_vhost_scsi \

	--fio-jobs=$WORKDIR/fiotest/fio_jobs/default_integrity.job \

	--qemu-src=/home/sys_sgsw/vhost/qemu

	--qemu-src=/home/sys_sgsw/vhost/qemu -x

    ;;

    -ib|--integrity-blk)

	echo Running blk integrity suite...
@@ -47,7 +47,7 @@ case $param in 
	--vm=0,/home/sys_sgsw/vhost_vm_image.qcow2,Nvme0n1p0:Nvme0n1p1:Nvme0n1p2:Nvme0n1p3 \

	--test-type=spdk_vhost_blk \

	--fio-jobs=$WORKDIR/fiotest/fio_jobs/default_integrity.job \

	--qemu-src=/home/sys_sgsw/vhost/qemu

	--qemu-src=/home/sys_sgsw/vhost/qemu -x

    ;;

	-f|--fs-integrity)

	echo Running filesystem integrity suite...
@@ -56,8 +56,8 @@ case $param in 
    -h|--help)

	echo "-i|--integrity 		for running an integrity test with vhost scsi"

	echo "-f|--fs-integrity 	for running an integrity test with filesystem"

	echo "-p|--performance 		for running a performance test with vhost scsi

	echo "-ib|--integrity-blk 	for running an integrity test with vhost blk""

	echo "-p|--performance 		for running a performance test with vhost scsi"

	echo "-ib|--integrity-blk 	for running an integrity test with vhost blk"

	echo "-pb|--performance-blk	for running a performance test with vhost blk"

	echo "-h|--help 		prints this message"

    ;;