ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/vhost: small fixes to common.sh file

Browse Source 
Change-Id: I7dd452a3e9535ad8e2612d8e9d99cf4f7f41b7d5
Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/387798
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Paweł Niedźwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Pawel Wodkowski 2017-11-16 15:33:09 +01:00 committed by Jim Harris
parent ac176c7e87
commit b1e850cd10
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/vhost/common/common.sh
View File

@ -12,7 +12,7 @@ SPDK_BUILD_DIR=$BASE_DIR/../../../
SPDK_VHOST_SCSI_TEST_DIR=$TEST_DIR/vhost SPDK_VHOST_SCSI_TEST_DIR=$TEST_DIR/vhost
# SSH key file # SSH key file
[[ -z "$SPDK_VHOST_SSH_KEY_FILE" ]] && SPDK_VHOST_SSH_KEY_FILE="$HOME/.ssh/spdk_vhost_id_rsa" : ${SPDK_VHOST_SSH_KEY_FILE="$HOME/.ssh/spdk_vhost_id_rsa"}
if [[ ! -e "$SPDK_VHOST_SSH_KEY_FILE" ]]; then if [[ ! -e "$SPDK_VHOST_SSH_KEY_FILE" ]]; then
echo "Could not find SSH key file $SPDK_VHOST_SSH_KEY_FILE" echo "Could not find SSH key file $SPDK_VHOST_SSH_KEY_FILE"
exit 1 exit 1
@ -42,7 +42,8 @@ function error()
echo "===========" echo "==========="
echo -e "ERROR: $@" echo -e "ERROR: $@"
echo "===========" echo "==========="
return 1 # Don't 'return 1' since the stack trace will be incomplete (why?) missing upper command.
false
} }
function spdk_vhost_run() function spdk_vhost_run()
@ -145,7 +146,7 @@ function assert_number()
# #
function vm_num_is_valid() function vm_num_is_valid()
{ {
[[ "$1" =~ [0-9]+ ]] && return 0 [[ "$1" =~ ^[0-9]+$ ]] && return 0
echo "${FUNCNAME[1]}() - ${BASH_LINENO[1]}: ERROR Invalid or missing paramter: vm number '$1'" > /dev/stderr echo "${FUNCNAME[1]}() - ${BASH_LINENO[1]}: ERROR Invalid or missing paramter: vm number '$1'" > /dev/stderr
return 1; return 1;
@ -317,7 +318,7 @@ function vm_kill()
echo "INFO: process $vm_pid killed" echo "INFO: process $vm_pid killed"
rm $vm_dir/qemu.pid rm $vm_dir/qemu.pid
elif vm_is_running $1; then elif vm_is_running $1; then
erorr "Process $vm_pid NOT killed" error "Process $vm_pid NOT killed"
return 1 return 1
fi fi
} }