Commit 3d738d45 authored by Lukasz Galka's avatar Lukasz Galka Committed by Daniel Verkamp
Browse files

test/vhost: move fiotest functions to common directory 



Move files from test/vhost/fiotest to test/vhost/common.
Scripts and functions from fio tests will be re-used in
any new test scripts.

Change-Id: I2423d636d41dcb2b2af12987769961607e969392
Signed-off-by: default avatarLukasz Galka <lukaszx.galka@intel.com>
Reviewed-on: https://review.gerrithub.io/372545


Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent a604a70e

test/vhost/fiotest/common.sh→test/vhost/common/common.sh

+6 −4
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ MAKE="make -j$(( $(nproc) * 2 ))" 
# Default running dir -> spdk/..

[[ -z "$TEST_DIR" ]] && TEST_DIR=$BASE_DIR/../../../../



COMMON_DIR="$(cd $BASE_DIR/../common && pwd)"

TEST_DIR="$(mkdir -p $TEST_DIR && cd $TEST_DIR && echo $PWD)"



SPDK_SRC_DIR=$TEST_DIR/spdk

SPDK_BUILD_DIR=$BASE_DIR/../../../

VHOST_APP=$SPDK_BUILD_DIR/app/vhost/vhost
@@ -39,7 +39,7 @@ INSTALL_DIR="$TEST_DIR/root" 


mkdir -p $TEST_DIR



. $BASE_DIR/autotest.config

. $COMMON_DIR/autotest.config



RPC_PORT=5260
@@ -125,11 +125,13 @@ function spdk_build_and_install() 


function spdk_vhost_run()

{

	local vhost_conf_path="$1"

	local vhost_app="$SPDK_BUILD_DIR/app/vhost/vhost"

	local vhost_log_file="$SPDK_VHOST_SCSI_TEST_DIR/vhost.log"

	local vhost_pid_file="$SPDK_VHOST_SCSI_TEST_DIR/vhost.pid"

	local vhost_socket="$SPDK_VHOST_SCSI_TEST_DIR/usvhost"

	local vhost_conf_template="$BASE_DIR/vhost.conf.in"

	local vhost_conf_file="$BASE_DIR/vhost.conf"

	local vhost_conf_template="$vhost_conf_path/vhost.conf.in"

	local vhost_conf_file="$vhost_conf_path/vhost.conf"

	echo "INFO: starting vhost app in background"

	[[ -r "$vhost_pid_file" ]] && spdk_vhost_kill

	[[ -d $SPDK_VHOST_SCSI_TEST_DIR ]] && rm -f $SPDK_VHOST_SCSI_TEST_DIR/*