From b529dbb1d01abc6d85b5e5d3634334402978100c Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Wed, 20 Nov 2019 15:36:49 -0700 Subject: [PATCH] test/nvmf: don't skip tcp tests over soft roce In the test pool, if a vm has previously had the soft-roce rxe module loaded, it will report up that the NIC is using Soft-RoCE. If we are doing the nvmf_tcp tests, then we should not exit prematurely. Change-Id: I67683632b0457a488826e207e77a4813bac982c9 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475316 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- test/nvmf/host/target_disconnect.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/nvmf/host/target_disconnect.sh b/test/nvmf/host/target_disconnect.sh index 2122fc460..fcd78733d 100755 --- a/test/nvmf/host/target_disconnect.sh +++ b/test/nvmf/host/target_disconnect.sh @@ -27,7 +27,7 @@ function disconnect_init() # There is an intermittent error relating to this test and Soft-RoCE. for now, just # skip this test if we are using rxe. TODO: get to the bottom of GitHub issue #1043 -if 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." exit 0 fi