From a7d79228d787feac707cb540a90366b9110724f6 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Thu, 19 Jan 2023 11:51:37 +0100 Subject: [PATCH] test/nvmf: remove silent skip of mDNS on RDMA Any script or function called with run_test needs to either execute or not be called at all. Summary of all test executions is gathered based on that. It would be possible to not catch that the test didn't execute. Signed-off-by: Tomasz Zawadzki Change-Id: Ib93d4ee9cccbcfa8506f9022f1a7cce97c0434f1 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16347 Tested-by: SPDK CI Jenkins Reviewed-by: Paul Luse Reviewed-by: Aleksey Marchuk Reviewed-by: Konrad Sztyber --- test/nvmf/host/mdns_discovery.sh | 5 ----- test/nvmf/nvmf.sh | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/test/nvmf/host/mdns_discovery.sh b/test/nvmf/host/mdns_discovery.sh index 7e3c4cbd7..f987f34a2 100755 --- a/test/nvmf/host/mdns_discovery.sh +++ b/test/nvmf/host/mdns_discovery.sh @@ -9,11 +9,6 @@ rootdir=$(readlink -f $testdir/../../..) source $rootdir/test/common/autotest_common.sh source $rootdir/test/nvmf/common.sh -if [ "$TEST_TRANSPORT" == "rdma" ]; then - echo "Skipping tests on RDMA because the rdma stack fails to configure the same IP for host and target." - exit 0 -fi - DISCOVERY_FILTER="address" DISCOVERY_PORT=8009 DISCOVERY_NQN=nqn.2014-08.org.nvmexpress.discovery diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh index 0e77366b5..9373ce824 100755 --- a/test/nvmf/nvmf.sh +++ b/test/nvmf/nvmf.sh @@ -92,7 +92,8 @@ run_test "nvmf_discovery" test/nvmf/host/discovery.sh "${TEST_ARGS[@]}" # TODO: disabled due to intermittent failures (RDMA_CM_EVENT_UNREACHABLE/ETIMEDOUT) #run_test test/nvmf/host/identify_kernel_nvmf.sh $TEST_ARGS -if [[ $SPDK_TEST_NVMF_MDNS -eq 1 ]]; then +if [[ $SPDK_TEST_NVMF_MDNS -eq 1 && "$SPDK_TEST_NVMF_TRANSPORT" == "tcp" ]]; then + # Skipping tests on RDMA because the rdma stack fails to configure the same IP for host and target. run_test "nvmf_mdns_discovery" test/nvmf/host/mdns_discovery.sh "${TEST_ARGS[@]}" fi