Commit 73bb5a71 authored by Ben Walker's avatar Ben Walker Committed by Darek Stojaczyk
Browse files

vhost: Use standard path names throughout tests 



Follow the pattern that most of the other tests follow by
defining testdir and rootdir at the top, then sourcing
the common files.

Change-Id: I8f4374e91f20edc244e8e8bcf8f9df198b4509c6
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454380


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 266772de

test/vhost/fiotest/fio.sh

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

set -e

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)"



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

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/vhost/common.sh



dry_run=false

no_shutdown=false
@@ -69,8 +71,6 @@ if [[ ! -r "$fio_job" ]]; then 
	fail "no fio job file specified"

fi



. $COMMON_DIR/../common.sh



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



vm_kill_all
@@ -80,7 +80,7 @@ if [[ $test_type =~ "spdk_vhost" ]]; then 
	notice ""

	notice "running SPDK"

	notice ""

	spdk_vhost_run --json-path=$AUTOTEST_BASE_DIR

	spdk_vhost_run --json-path=$testdir

	notice ""

fi

test/vhost/hotplug/common.sh

+10 −5
Original line number Diff line number Diff line 
testdir=$(readlink -f $(dirname $0))

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/vhost/common.sh

source $rootdir/test/vhost/hotplug/common.sh



dry_run=false

no_shutdown=false

fio_bin="fio"

fio_jobs="$HOTPLUG_DIR/fio_jobs/"

fio_jobs="$testdir/fio_jobs/"

test_type=spdk_vhost_scsi

reuse_vms=false

vms=()
@@ -56,10 +62,9 @@ while getopts 'xh-:' optchar; do 
done

shift $(( OPTIND - 1 ))



fio_job=$HOTPLUG_DIR/fio_jobs/default_integrity.job

tmp_attach_job=$HOTPLUG_DIR/fio_jobs/fio_attach.job.tmp

tmp_detach_job=$HOTPLUG_DIR/fio_jobs/fio_detach.job.tmp

. $HOTPLUG_DIR/../common.sh

fio_job=$testdir/fio_jobs/default_integrity.job

tmp_attach_job=$testdir/fio_jobs/fio_attach.job.tmp

tmp_detach_job=$testdir/fio_jobs/fio_detach.job.tmp



rpc_py="$SPDK_BUILD_DIR/scripts/rpc.py -s $(get_vhost_dir)/rpc.sock"

test/vhost/hotplug/scsi_hotattach.sh

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

set -e

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



. $HOTPLUG_DIR/common.sh

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

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/vhost/common.sh

source $rootdir/test/vhost/hotplug/common.sh



function prepare_fio_cmd_tc1() {

    print_test_fio_header

test/vhost/hotplug/scsi_hotdetach.sh

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



set -e

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



. $HOTPLUG_DIR/common.sh

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

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/vhost/common.sh

source $rootdir/test/vhost/hotplug/common.sh



function get_first_disk() {

    vm_check_scsi_location $1

test/vhost/hotplug/scsi_hotplug.sh

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

set -e

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

. $HOTPLUG_DIR/common.sh



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

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/vhost/common.sh

source $rootdir/test/vhost/hotplug/common.sh



if [[ $scsi_hot_remove_test == 1 ]] && [[ $blk_hot_remove_test == 1 ]]; then

    notice "Vhost-scsi and vhost-blk hotremove tests cannot be run together"
@@ -71,9 +75,9 @@ $rpc_py get_bdevs 


if [[ $scsi_hot_remove_test == 0 ]] && [[ $blk_hot_remove_test == 0 ]]; then

    pre_hot_attach_detach_test_case

    $HOTPLUG_DIR/scsi_hotattach.sh --fio-bin=$fio_bin &

    $testdir/scsi_hotattach.sh --fio-bin=$fio_bin &

    first_script=$!

    $HOTPLUG_DIR/scsi_hotdetach.sh --fio-bin=$fio_bin &

    $testdir/scsi_hotdetach.sh --fio-bin=$fio_bin &

    second_script=$!

    wait $first_script

    wait $second_script
@@ -81,9 +85,9 @@ if [[ $scsi_hot_remove_test == 0 ]] && [[ $blk_hot_remove_test == 0 ]]; then 
    clear_vhost_config

fi

if [[ $scsi_hot_remove_test == 1 ]]; then

    source $HOTPLUG_DIR/scsi_hotremove.sh

    source $testdir/scsi_hotremove.sh

fi

if [[ $blk_hot_remove_test == 1 ]]; then

    source $HOTPLUG_DIR/blk_hotremove.sh

    source $testdir/blk_hotremove.sh

fi

post_test_case