test/nvmf: don't return before calling nvmftestfini

This is necessary to avoid leaving the machine in a bad state between
test runs.

Change-Id: I2c68d2dc88f0f9f4cab099564d25a3e21eb5671c
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1027
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Seth Howell 2020-02-26 14:18:41 -07:00 committed by Tomasz Zawadzki
parent 62610945c0
commit bad25cad1b

View File

@ -78,15 +78,14 @@ nvmftestinit
# skip this test if we are using rxe. TODO: get to the bottom of GitHub issue #1043 # skip this test if we are using rxe. TODO: get to the bottom of GitHub issue #1043
if [ $TEST_TRANSPORT == "rdma" ] && check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then if [ $TEST_TRANSPORT == "rdma" ] && check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then
echo "Using software RDMA, skipping the target disconnect tests." echo "Using software RDMA, skipping the target disconnect tests."
exit 0 else
run_test "nvmf_target_disconnect_tc1" nvmf_target_disconnect_tc1
run_test "nvmf_target_disconnect_tc2" nvmf_target_disconnect_tc2
if [ -n "$NVMF_SECOND_TARGET_IP" ]; then
run_test "nvmf_target_disconnect_tc3" nvmf_target_disconnect_tc3
fi
fi fi
run_test "nvmf_target_disconnect_tc1" nvmf_target_disconnect_tc1
run_test "nvmf_target_disconnect_tc2" nvmf_target_disconnect_tc2
if [ -n "$NVMF_SECOND_TARGET_IP" ]; then
run_test "nvmf_target_disconnect_tc3" nvmf_target_disconnect_tc3
fi
trap - SIGINT SIGTERM EXIT trap - SIGINT SIGTERM EXIT
rm -f $PLUGIN_DIR/example_config_extended.fio || true
nvmftestfini nvmftestfini