Commit 12fd2b05 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/vhost/hotplug: Don't source autotest_common.sh twice 



Allow vhost/hotplug/common.sh to do all the work.

Change-Id: I315468a891eec4095dca577c1576ded2f46d6d4e
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/20573


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 604c1b6f

test/vhost/hotplug/scsi_hotattach.sh

+1 −3
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ 
#

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

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



function prepare_fio_cmd_tc1() {

	print_test_fio_header

test/vhost/hotplug/scsi_hotdetach.sh

+1 −3
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ 
#

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

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



function get_first_disk() {

	vm_check_scsi_location $1

test/vhost/hotplug/scsi_hotplug.sh

+1 −3
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ 
#

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

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"