Commit 2d272954 authored by Pawel Niedzwiecki's avatar Pawel Niedzwiecki Committed by Darek Stojaczyk
Browse files

test/iscsi_tgt: Remove secondary process from iscsi_tgt tests. 



Removing stub from iscsi_tgt tests reduces execution time
approximately 15-20s.

Change-Id: I4455b6d86ab8cd5bed67bd571dc748bc3c834313
Signed-off-by: default avatarPawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/436850


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent fbec7029

test/iscsi_tgt/common.sh

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ NETMASK=$INITIATOR_IP/32 
INITIATOR_TAG=2

INITIATOR_NAME=ANY

PORTAL_TAG=1

ISCSI_APP="$TARGET_NS_CMD ./app/iscsi_tgt/iscsi_tgt -i 0"

ISCSI_APP="$TARGET_NS_CMD ./app/iscsi_tgt/iscsi_tgt"

ISCSI_TEST_CORE_MASK=0xFF



function create_veth_interfaces() {

test/iscsi_tgt/iscsi_tgt.sh

+1 −10
Original line number Diff line number Diff line
@@ -22,15 +22,7 @@ fi 
# Network configuration

create_veth_interfaces $TEST_TYPE



# ISCSI_TEST_CORE_MASK is the biggest core mask specified by

#  any of the iscsi_tgt tests.  Using this mask for the stub

#  ensures that if this mask spans CPU sockets, that we will

#  allocate memory from both sockets.  The stub will *not*

#  run anything on the extra cores (and will sleep on master

#  core 0) so there is no impact to the iscsi_tgt tests by

#  specifying the bigger core mask.

start_stub "-s 2048 -i 0 -m $ISCSI_TEST_CORE_MASK"

trap "kill_stub; cleanup_veth_interfaces $TEST_TYPE; exit 1" SIGINT SIGTERM EXIT

trap "cleanup_veth_interfaces $TEST_TYPE; exit 1" SIGINT SIGTERM EXIT



run_test suite ./test/iscsi_tgt/sock/sock.sh

run_test suite ./test/iscsi_tgt/calsoft/calsoft.sh
@@ -54,7 +46,6 @@ if [ $SPDK_TEST_RBD -eq 1 ]; then 
fi



trap "cleanup_veth_interfaces $TEST_TYPE; exit 1" SIGINT SIGTERM EXIT

kill_stub



if [ $SPDK_TEST_NVMF -eq 1 ]; then

	# TODO: enable remote NVMe controllers with multi-process so that