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: Pawel Wodkowski <pawelx.wodkowski@intel.com> Reviewed-on: https://review.gerrithub.io/393145 Reviewed-by: Karol Latecki <karol.latecki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com> Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
parent
ac021a2e7d
commit
aa0f44b53b
@ -84,7 +84,7 @@ if [[ $test_type =~ "spdk_vhost" ]]; then
|
|||||||
notice ""
|
notice ""
|
||||||
notice "running SPDK"
|
notice "running SPDK"
|
||||||
notice ""
|
notice ""
|
||||||
$COMMON_DIR/run_vhost.sh $x --work-dir=$TEST_DIR --conf-dir=$BASE_DIR
|
spdk_vhost_run $BASE_DIR
|
||||||
notice ""
|
notice ""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ function run_vhost() {
|
|||||||
notice ""
|
notice ""
|
||||||
notice "running SPDK"
|
notice "running SPDK"
|
||||||
notice ""
|
notice ""
|
||||||
$BASE_DIR/../common/run_vhost.sh $x --work-dir=$TEST_DIR --conf-dir=$BASE_DIR
|
spdk_vhost_run $BASE_DIR
|
||||||
notice ""
|
notice ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,8 +15,6 @@ END_OF_CONFIG
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Run spdk by calling run_vhost from hotplug/common.sh.
|
# 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.
|
# Then prepare vhost with rpc calls and setup and run 4 VMs.
|
||||||
function pre_test_case() {
|
function pre_test_case() {
|
||||||
used_vms=""
|
used_vms=""
|
||||||
|
@ -115,7 +115,7 @@ trap 'error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
|
|||||||
vm_kill_all
|
vm_kill_all
|
||||||
|
|
||||||
notice "running SPDK vhost"
|
notice "running SPDK vhost"
|
||||||
$COMMON_DIR/run_vhost.sh $x --work-dir=$TEST_DIR --conf-dir=$BASE_DIR
|
spdk_vhost_run $BASE_DIR
|
||||||
notice "..."
|
notice "..."
|
||||||
|
|
||||||
trap 'clean_lvol_cfg; error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
|
trap 'clean_lvol_cfg; error_exit "${FUNCNAME}" "${LINENO}"' SIGTERM SIGABRT ERR
|
||||||
|
Loading…
Reference in New Issue
Block a user