Commit b5207c44 authored by Pawel Wodkowski's avatar Pawel Wodkowski Committed by Jim Harris
Browse files

test/vhost: remove obsolete parameters 'qemu-src' and 'dpdk-src' 



This was removed some time ago.

Change-Id: I5e4b588fb881793d750999ff73e8bf891cb58fc0
Signed-off-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/391952


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 3911366d

test/vhost/fiotest/autotest.sh

+0 −32
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ remote_fio_bin="" 
fio_jobs=""

test_type=spdk_vhost_scsi

reuse_vms=false

force_build=false

vms=()

used_vms=""

x=""
@@ -30,15 +29,12 @@ function usage() 
	echo "                          spdk_vhost_blk - use spdk vhost block"

	echo "-x                        set -x for script debug"

	echo "    --fio-bin=FIO         Use specific fio binary (will be uploaded to VM)"

	echo "    --qemu-src=QEMU_DIR   Location of the QEMU sources"

	echo "    --dpdk-src=DPDK_DIR   Location of the DPDK sources"

	echo "    --fio-job=            Fio config to use for test."

	echo "                          All VMs will run the same fio job when FIO executes."

	echo "                          (no unique jobs for specific VMs)"

	echo "    --work-dir=WORK_DIR   Where to find build file. Must exist. [default: $TEST_DIR]"

	echo "    --dry-run             Don't perform any tests, run only and wait for enter to terminate"

	echo "    --no-shutdown         Don't shutdown at the end but leave envirionment working"

	echo "    --force-build         Force SPDK rebuild with the specified DPDK path."

	echo "    --vm=NUM[,OS][,DISKS] VM configuration. This parameter might be used more than once:"

	echo "                          NUM - VM number (mandatory)"

	echo "                          OS - VM os disk path (optional)"
@@ -57,13 +53,10 @@ while getopts 'xh-:' optchar; do 
			help) usage $0 ;;

			work-dir=*) TEST_DIR="${OPTARG#*=}" ;;

			fio-bin=*) fio_bin="--fio-bin=${OPTARG#*=}" ;;

			qemu-src=*) QEMU_SRC_DIR="${OPTARG#*=}" ;;

			dpdk-src=*) DPDK_SRC_DIR="${OPTARG#*=}" ;;

			fio-job=*) fio_job="${OPTARG#*=}" ;;

			dry-run) dry_run=true ;;

			no-shutdown) no_shutdown=true ;;

			test-type=*) test_type="${OPTARG#*=}" ;;

			force-build) force_build=true ;;

			vm=*) vms+=("${OPTARG#*=}") ;;

			*) usage $0 "Invalid argument '$OPTARG'" ;;

		esac
@@ -85,31 +78,6 @@ fi 


trap 'error_exit "${FUNCNAME}" "${LINENO}"' ERR



echo "==============="

echo "INFO: checking qemu"



if [[ ! -x $INSTALL_DIR/bin/qemu-system-x86_64 ]]; then

	echo "INFO: can't find $INSTALL_DIR/bin/qemu-system-x86_64 - building and installing"



	if [[ ! -d $QEMU_SRC_DIR ]]; then

		echo "ERROR: Cannot find qemu source in $QEMU_SRC_DIR"

		exit 1

	else

		echo "INFO: qemu source exists $QEMU_SRC_DIR - building"

		qemu_build_and_install

	fi

fi



echo "==============="

echo ""

echo "INFO: checking spdk"

echo ""



if [[ ! -x $SPDK_BUILD_DIR/app/vhost/vhost ]] || $force_build ; then

	echo "INFO: $SPDK_BUILD_DIR/app/vhost/vhost - building and installing"

	spdk_build_and_install

fi



vm_kill_all



if [[ $test_type =~ "spdk_vhost" ]]; then

test/vhost/lvol/lvol_test.sh

+0 −9
Original line number Diff line number Diff line
@@ -85,15 +85,6 @@ trap 'error_exit "${FUNCNAME}" "${LINENO}"' ERR 


vm_kill_all



echo "==============="

echo ""

echo "INFO: checking spdk"

echo ""

if [[ ! -x $SPDK_BUILD_DIR/app/vhost/vhost ]]; then

    echo "ERROR: SPDK Vhost is not present - please build it."

    exit 1

fi



echo "INFO: running SPDK"

echo ""

$COMMON_DIR/run_vhost.sh $x --work-dir=$TEST_DIR --conf-dir=$BASE_DIR

test/vhost/spdk_vhost.sh

+4 −6
Original line number Diff line number Diff line
@@ -60,16 +60,14 @@ case $1 in 
		./fiotest/autotest.sh --fio-bin=/home/sys_sgsw/fio_ubuntu \

		--vm=0,$VM_IMAGE,Nvme0n1p0 \

		--test-type=spdk_vhost_scsi \

		--fio-job=$WORKDIR/common/fio_jobs/default_performance.job \

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

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

		--vm=0,$VM_IMAGE,Nvme0n1p0 \

		--test-type=spdk_vhost_blk \

		--fio-job=$WORKDIR/common/fio_jobs/default_performance.job \

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

		--fio-job=$WORKDIR/common/fio_jobs/default_performance.job

		;;

	-i|--integrity)

		echo 'Running SCSI integrity suite...'
@@ -77,7 +75,7 @@ case $1 in 
		--vm=0,$VM_IMAGE,Nvme0n1p0:Nvme0n1p1:Nvme0n1p2:Nvme0n1p3 \

		--test-type=spdk_vhost_scsi \

		--fio-job=$WORKDIR/common/fio_jobs/default_integrity.job \

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

		-x

		;;

	-ib|--integrity-blk)

		echo 'Running blk integrity suite...'
@@ -85,7 +83,7 @@ case $1 in 
		--vm=0,$VM_IMAGE,Nvme0n1p0:Nvme0n1p1:Nvme0n1p2:Nvme0n1p3 \

		--test-type=spdk_vhost_blk \

		--fio-job=$WORKDIR/common/fio_jobs/default_integrity.job \

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

		-x

		;;

	-fs|--fs-integrity-scsi)

		echo 'Running filesystem integrity suite...'