Commit f54106e7 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

test/vhost: Add proper path for BASE_DIR variable in common.sh library. 


            Fix in scripts that use BASE_DIR variable
            that is redefined in common.sh.

Change-Id: Ie4ad9fb85f0042d274738f19b0d4696b2056efda
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/411833


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarPaweł Niedźwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 99c8c6d8

test/vhost/common/common.sh

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ set -e 
: ${SPDK_VHOST_VERBOSE=false}

: ${QEMU_PREFIX="/usr/local/qemu/spdk-2.12-pre"}



BASE_DIR=$(readlink -f $(dirname $0))

BASE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))



# Default running dir -> spdk/..

[[ -z "$TEST_DIR" ]] && TEST_DIR=$BASE_DIR/../../../../

test/vhost/fiotest/autotest.sh

+4 −4
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -e

BASE_DIR=$(readlink -f $(dirname $0))

[[ -z "$COMMON_DIR" ]] && COMMON_DIR="$(cd $BASE_DIR/../common && pwd)"

[[ -z "$TEST_DIR" ]] && TEST_DIR="$(cd $BASE_DIR/../../../../ && pwd)"

AUTOTEST_BASE_DIR=$(readlink -f $(dirname $0))

[[ -z "$COMMON_DIR" ]] && COMMON_DIR="$(cd $AUTOTEST_BASE_DIR/../common && pwd)"

[[ -z "$TEST_DIR" ]] && TEST_DIR="$(cd $AUTOTEST_BASE_DIR/../../../../ && pwd)"



dry_run=false

no_shutdown=false
@@ -82,7 +82,7 @@ if [[ $test_type =~ "spdk_vhost" ]]; then 
	notice ""

	notice "running SPDK"

	notice ""

	spdk_vhost_run --conf-path=$BASE_DIR

	spdk_vhost_run --conf-path=$AUTOTEST_BASE_DIR

	notice ""

fi

test/vhost/initiator/blockdev.sh

+10 −10
Original line number Diff line number Diff line 
#!/usr/bin/env bash



set -e

BASE_DIR=$(readlink -f $(dirname $0))

[[ -z "$COMMON_DIR" ]] && COMMON_DIR="$(cd $BASE_DIR/../common && pwd)"

ROOT_DIR=$(readlink -f $BASE_DIR/../../..)

INITIATOR_DIR=$(readlink -f $(dirname $0))

[[ -z "$COMMON_DIR" ]] && COMMON_DIR="$(cd $INITIATOR_DIR/../common && pwd)"

ROOT_DIR=$(readlink -f $INITIATOR_DIR/../../..)



function usage()

{
@@ -31,7 +31,7 @@ while getopts 'h-:' optchar; do 
done



source $COMMON_DIR/common.sh

source $BASE_DIR/autotest.config

source $INITIATOR_DIR/autotest.config

PLUGIN_DIR=$ROOT_DIR/examples/bdev/fio_plugin

RPC_PY="$ROOT_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"

FIO_BIN="/usr/src/fio/fio"
@@ -79,14 +79,14 @@ function create_bdev_config() 
	$RPC_PY construct_vhost_scsi_controller naa.Malloc1.0

	$RPC_PY add_vhost_scsi_lun naa.Malloc1.0 0 Malloc1



	vbdevs=$(discover_bdevs $ROOT_DIR $BASE_DIR/bdev.conf)

	vbdevs=$(discover_bdevs $ROOT_DIR $INITIATOR_DIR/bdev.conf)

	virtio_bdevs=$(jq -r '[.[].name] | join(":")' <<< $vbdevs)

	virtio_with_unmap=$(jq -r '[.[] | select(.supported_io_types.unmap==true).name]

	 | join(":")' <<< $vbdevs)

}



timing_enter spdk_vhost_run

spdk_vhost_run --conf-path=$BASE_DIR

spdk_vhost_run --conf-path=$INITIATOR_DIR

timing_exit spdk_vhost_run



timing_enter create_bdev_config
@@ -94,14 +94,14 @@ create_bdev_config 
timing_exit create_bdev_config



timing_enter run_spdk_fio

run_spdk_fio $BASE_DIR/bdev.fio --filename=$virtio_bdevs --section=job_randwrite --section=job_randrw \

	--section=job_write --section=job_rw --spdk_conf=$BASE_DIR/bdev.conf

run_spdk_fio $INITIATOR_DIR/bdev.fio --filename=$virtio_bdevs --section=job_randwrite --section=job_randrw \

	--section=job_write --section=job_rw --spdk_conf=$INITIATOR_DIR/bdev.conf

report_test_completion "vhost_run_spdk_fio"

timing_exit run_spdk_fio



timing_enter run_spdk_fio_unmap

run_spdk_fio $BASE_DIR/bdev.fio --filename=$virtio_with_unmap --spdk_conf=$BASE_DIR/bdev.conf \

	--spdk_conf=$BASE_DIR/bdev.conf

run_spdk_fio $INITIATOR_DIR/bdev.fio --filename=$virtio_with_unmap --spdk_conf=$INITIATOR_DIR/bdev.conf \

	--spdk_conf=$INITIATOR_DIR/bdev.conf

timing_exit run_spdk_fio_unmap



timing_enter setup_vm

test/vhost/integrity/integrity_start.sh

+3 −2
Original line number Diff line number Diff line 
#!/usr/bin/env bash

set -e



INTEGRITY_BASE_DIR=$(readlink -f $(dirname $0))

ctrl_type="spdk_vhost_scsi"

vm_fs="ext4"
@@ -55,7 +56,7 @@ trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR 
vm_kill_all



notice "Starting SPDK vhost"

spdk_vhost_run --conf-path=$BASE_DIR

spdk_vhost_run --conf-path=$INTEGRITY_BASE_DIR

notice "..."



# Set up lvols and vhost controllers
@@ -82,7 +83,7 @@ vm_run 0 
vm_wait_for_boot 600 0



# Run tests on VM

vm_scp 0 $BASE_DIR/integrity_vm.sh root@127.0.0.1:/root/integrity_vm.sh

vm_scp 0 $INTEGRITY_BASE_DIR/integrity_vm.sh root@127.0.0.1:/root/integrity_vm.sh

vm_ssh 0 "~/integrity_vm.sh $ctrl_type \"$vm_fs\""



notice "Shutting down virtual machine..."

test/vhost/lvol/lvol_test.sh

+5 −5
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ set -e 
rootdir=$(readlink -f $(dirname $0))/../../..

source "$rootdir/scripts/common.sh"



BASE_DIR=$(readlink -f $(dirname $0))

[[ -z "$TEST_DIR" ]] && TEST_DIR="$(cd $BASE_DIR/../../../../ && pwd)"

[[ -z "$COMMON_DIR" ]] && COMMON_DIR="$(cd $BASE_DIR/../common && pwd)"

LVOL_TEST_DIR=$(readlink -f $(dirname $0))

[[ -z "$TEST_DIR" ]] && TEST_DIR="$(cd $LVOL_TEST_DIR/../../../../ && pwd)"

[[ -z "$COMMON_DIR" ]] && COMMON_DIR="$(cd $LVOL_TEST_DIR/../common && pwd)"



. $COMMON_DIR/common.sh

rpc_py="python $SPDK_BUILD_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"
@@ -113,7 +113,7 @@ fi 


if $distribute_cores; then

    # FIXME: this need to be handled entirely in common.sh

    source $BASE_DIR/autotest.config

    source $LVOL_TEST_DIR/autotest.config

fi



trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
@@ -121,7 +121,7 @@ trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR 
vm_kill_all



notice "running SPDK vhost"

spdk_vhost_run --conf-path=$BASE_DIR

spdk_vhost_run --conf-path=$LVOL_TEST_DIR

notice "..."



trap 'clean_lvol_cfg; error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR