Commit 656c938d authored by Jim Harris's avatar Jim Harris
Browse files

test/nvmf: fix a couple of bugs in nvmf.sh 



1) nmic is a target test - move it out of the host
   section
2) don't reset trap until after all tests have run
3) while here, move all of the target-related test
   together, followed by the host tests

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

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 460796a6

test/nvmf/nvmf.sh

+5 −4
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ if [ $RUN_NIGHTLY -eq 1 ]; then 
	run_test suite test/nvmf/multiconnection/multiconnection.sh

fi



run_test suite test/nvmf/nmic/nmic.sh

run_test suite test/nvmf/rpc/rpc.sh

run_test suite test/nvmf/fio/fio.sh



timing_enter host



run_test suite test/nvmf/host/bdevperf.sh
@@ -41,13 +45,10 @@ run_test suite test/nvmf/host/aer.sh 
if [ $SPDK_RUN_ASAN -eq 0 ]; then

    run_test suite test/nvmf/host/fio.sh

fi

run_test suite test/nvmf/nmic/nmic.sh



timing_exit host

trap - SIGINT SIGTERM EXIT



run_test suite test/nvmf/rpc/rpc.sh

run_test suite test/nvmf/fio/fio.sh

trap - SIGINT SIGTERM EXIT

revert_soft_roce



report_test_completion "nvmf"