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

test/vhost: don't call run_vhost.sh to start vhost app 



run_vhost.sh is a proxy script for spdk_vhost_run function which should
be called directly.

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


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent ac021a2e

test/vhost/fiotest/autotest.sh

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ if [[ $test_type =~ "spdk_vhost" ]]; then 
	notice ""

	notice "running SPDK"

	notice ""

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

	spdk_vhost_run $BASE_DIR

	notice ""

fi

test/vhost/hotplug/common.sh

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ function run_vhost() { 
    notice ""

    notice "running SPDK"

    notice ""

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

    spdk_vhost_run $BASE_DIR

    notice ""

}

test/vhost/hotplug/scsi_hotplug.sh

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ END_OF_CONFIG 
}



# Run spdk by calling run_vhost from hotplug/common.sh.

# Run_vhost uses run_vhost.sh (test/vhost/common) script.

# This script calls spdk_vhost_run (common/common.sh) to run vhost.

# Then prepare vhost with rpc calls and setup and run 4 VMs.

function pre_test_case() {

    used_vms=""

test/vhost/lvol/lvol_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR 
vm_kill_all



notice "running SPDK vhost"

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

spdk_vhost_run $BASE_DIR

notice "..."



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