Commit d0201cb1 authored by Jim Harris's avatar Jim Harris Committed by Ben Walker
Browse files

test/nvmf: remove NVMF_FIRST_TARGET_IP duplication from host tests 



These scripts already call nvmftestinit which sets up the
NVMF_FIRST_TARGET_IP variable.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: Id732e2e7c981bf557518489776aaacebeeecdfa8

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456652


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 7bb1c573

test/nvmf/host/aer.sh

+0 −7
Original line number Diff line number Diff line
@@ -11,13 +11,6 @@ set -e 


nvmftestinit



RDMA_IP_LIST=$(get_available_rdma_ips)

NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)

if [ -z $NVMF_FIRST_TARGET_IP ]; then

	echo "no NIC for nvmf test"

	exit 0

fi



timing_enter aer

timing_enter start_nvmf_tgt

test/nvmf/host/bdevperf.sh

+0 −7
Original line number Diff line number Diff line
@@ -14,13 +14,6 @@ set -e 


nvmftestinit



RDMA_IP_LIST=$(get_available_rdma_ips)

NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)

if [ -z $NVMF_FIRST_TARGET_IP ]; then

	echo "no NIC for nvmf test"

	exit 0

fi



timing_enter bdevperf

timing_enter start_nvmf_tgt

test/nvmf/host/fio.sh

+0 −7
Original line number Diff line number Diff line
@@ -12,13 +12,6 @@ set -e 


nvmftestinit



RDMA_IP_LIST=$(get_available_rdma_ips)

NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)

if [ -z $NVMF_FIRST_TARGET_IP ]; then

	echo "no NIC for nvmf test"

	exit 0

fi



if [ ! -d /usr/src/fio ]; then

	echo "FIO not available"

	exit 0

test/nvmf/host/identify.sh

+0 −6
Original line number Diff line number Diff line
@@ -13,12 +13,6 @@ rpc_py="$rootdir/scripts/rpc.py" 
set -e

nvmftestinit



RDMA_IP_LIST=$(get_available_rdma_ips)

NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)

if [ -z $NVMF_FIRST_TARGET_IP ]; then

	echo "no NIC for nvmf test"

	exit 0

fi

timing_enter identify

timing_enter start_nvmf_tgt

test/nvmf/host/identify_kernel_nvmf.sh

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ source $rootdir/test/nvmf/common.sh 
set -e

nvmftestinit



RDMA_IP_LIST=$(get_available_rdma_ips)

NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)

if [ -z $NVMF_FIRST_TARGET_IP ]; then

	echo "no NIC for nvmf test"

	exit 0

fi



timing_enter identify_kernel_nvmf_tgt



subsystemname=nqn.2016-06.io.spdk:testnqn