From b5207c44885be4c6e58bd9d4378c9ed282f39ecf Mon Sep 17 00:00:00 2001 From: Pawel Wodkowski Date: Fri, 15 Dec 2017 18:29:26 +0100 Subject: [PATCH] test/vhost: remove obsolete parameters 'qemu-src' and 'dpdk-src' This was removed some time ago. Change-Id: I5e4b588fb881793d750999ff73e8bf891cb58fc0 Signed-off-by: Pawel Wodkowski Reviewed-on: https://review.gerrithub.io/391952 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Karol Latecki Reviewed-by: Jim Harris --- test/vhost/fiotest/autotest.sh | 32 -------------------------------- test/vhost/lvol/lvol_test.sh | 9 --------- test/vhost/spdk_vhost.sh | 10 ++++------ 3 files changed, 4 insertions(+), 47 deletions(-) diff --git a/test/vhost/fiotest/autotest.sh b/test/vhost/fiotest/autotest.sh index fc94e7916..62cc0cf64 100755 --- a/test/vhost/fiotest/autotest.sh +++ b/test/vhost/fiotest/autotest.sh @@ -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 diff --git a/test/vhost/lvol/lvol_test.sh b/test/vhost/lvol/lvol_test.sh index 3d28ceccc..e09adf673 100755 --- a/test/vhost/lvol/lvol_test.sh +++ b/test/vhost/lvol/lvol_test.sh @@ -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 diff --git a/test/vhost/spdk_vhost.sh b/test/vhost/spdk_vhost.sh index 37f4f93d9..e329dda21 100755 --- a/test/vhost/spdk_vhost.sh +++ b/test/vhost/spdk_vhost.sh @@ -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...'