Commit 3d38fcc3 authored by cunyinch's avatar cunyinch Committed by Ben Walker
Browse files

test/nvmf: use stub application 



The stub application will ensure that each
nvmf test does not need to reinitialized DPDK
memory and NVMe devices.  This drastically
cuts down on the amount of time needed to run
all of the nvmf tests.

Change-Id: I6abad4e1298111884f18026e72e36f5d8b73c4b9
Signed-off-by: default avatarcunyinch <cunyin.chang@intel.com>
Reviewed-on: https://review.gerrithub.io/362810


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent ad84526d

test/nvmf/common.sh

+8 −0
Original line number Diff line number Diff line
@@ -6,6 +6,14 @@ NVMF_IP_LEAST_ADDR=8 
NVMF_FIRST_TARGET_IP=$NVMF_IP_PREFIX.$NVMF_IP_LEAST_ADDR

RPC_PORT=5260



if [ -z "$NVMF_APP" ]; then

	NVMF_APP=./app/nvmf_tgt/nvmf_tgt

fi



if [ -z "$NVMF_TEST_CORE_MASK" ]; then

	NVMF_TEST_CORE_MASK=0xFFFF

fi



function load_ib_rdma_modules()

{

	if [ `uname` != Linux ]; then

test/nvmf/discovery/discovery.sh

+3 −2
Original line number Diff line number Diff line
@@ -23,14 +23,15 @@ if ! rdma_nic_available; then 
fi



timing_enter discovery



timing_enter start_nvmf_tgt

# Start up the NVMf target in another process

$rootdir/app/nvmf_tgt/nvmf_tgt -c $testdir/../nvmf.conf &

$NVMF_APP -c $testdir/../nvmf.conf &

nvmfpid=$!



trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid ${RPC_PORT}

timing_exit start_nvmf_tgt



bdevs="$bdevs $($rpc_py construct_null_bdev Null0 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)"

bdevs="$bdevs $($rpc_py construct_null_bdev Null1 $NULL_BDEV_SIZE $NULL_BLOCK_SIZE)"

test/nvmf/filesystem/filesystem.sh

+3 −2
Original line number Diff line number Diff line
@@ -18,14 +18,15 @@ if ! rdma_nic_available; then 
fi



timing_enter fs_test



timing_enter start_nvmf_tgt

# Start up the NVMf target in another process

$rootdir/app/nvmf_tgt/nvmf_tgt -c $testdir/../nvmf.conf &

$NVMF_APP -c $testdir/../nvmf.conf &

nvmfpid=$!



trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid ${RPC_PORT}

timing_exit start_nvmf_tgt



bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

test/nvmf/fio/fio.sh

+3 −2
Original line number Diff line number Diff line
@@ -18,14 +18,15 @@ if ! rdma_nic_available; then 
fi



timing_enter fio



timing_enter start_nvmf_tgt

# Start up the NVMf target in another process

$rootdir/app/nvmf_tgt/nvmf_tgt -c $testdir/../nvmf.conf &

$NVMF_APP -c $testdir/../nvmf.conf &

nvmfpid=$!



trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid ${RPC_PORT}

timing_exit start_nvmf_tgt



bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

test/nvmf/host/aer.sh

+3 −2
Original line number Diff line number Diff line
@@ -15,14 +15,15 @@ if ! rdma_nic_available; then 
fi



timing_enter aer

timing_enter start_nvmf_tgt



# Start up the NVMf target in another process

$rootdir/app/nvmf_tgt/nvmf_tgt -c $testdir/../nvmf.conf -m 0x2 -p 1 -s 512 &

$NVMF_APP -c $testdir/../nvmf.conf &

nvmfpid=$!



trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT



waitforlisten $nvmfpid ${RPC_PORT}

timing_exit start_nvmf_tgt



$rpc_py construct_nvmf_subsystem Direct nqn.2016-06.io.spdk:cnode1 'transport:RDMA traddr:192.168.100.8 trsvcid:4420' '' -p "*"