From bad25cad1bc76aa799da825eb7cc8e2985bf82f1 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Wed, 26 Feb 2020 14:18:41 -0700 Subject: [PATCH] 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 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1027 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Karol Latecki Reviewed-by: Tomasz Zawadzki Reviewed-by: Shuhei Matsumoto --- test/nvmf/host/target_disconnect.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test/nvmf/host/target_disconnect.sh b/test/nvmf/host/target_disconnect.sh index 6a6f1d4efa..d32feba08c 100755 --- a/test/nvmf/host/target_disconnect.sh +++ b/test/nvmf/host/target_disconnect.sh @@ -78,15 +78,14 @@ nvmftestinit # 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 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 -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 -rm -f $PLUGIN_DIR/example_config_extended.fio || true nvmftestfini