From 64569ea5e5c9ae4a6494d2e2952b31f815b0f6ab Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 5 Dec 2019 16:43:36 -0700 Subject: [PATCH] test: differentiate between different nvmf transports. We have to do this explicitly so that the list of completed tests that comes out at the end is explicit as well. Change-Id: Ic89357f2ebd89ea80f00010a78b2a2ad05b22591 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476963 Community-CI: SPDK CI Jenkins Community-CI: Broadcom SPDK FC-NVMe CI Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Reviewed-by: Karol Latecki --- autotest.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/autotest.sh b/autotest.sh index f6fc5ac52..4d01c63f5 100755 --- a/autotest.sh +++ b/autotest.sh @@ -213,8 +213,21 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then fi if [ $SPDK_TEST_NVMF -eq 1 ]; then - run_test "nvmf" ./test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT - run_test "spdkcli_nvmf" ./test/spdkcli/nvmf.sh + # The NVMe-oF run test cases are split out like this so that the parser that compiles the + # list of all tests can properly differentiate them. Please do not merge them into one line. + if [ "$SPDK_TEST_NVMF_TRANSPORT" = "rdma" ]; then + run_test "nvmf_rdma" ./test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT + run_test "spdkcli_nvmf_rdma" ./test/spdkcli/nvmf.sh + elif [ "$SPDK_TEST_NVMF_TRANSPORT" = "tcp" ]; then + run_test "nvmf_tcp" ./test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT + run_test "spdkcli_nvmf_tcp" ./test/spdkcli/nvmf.sh + elif [ "$SPDK_TEST_NVMF_TRANSPORT" = "fc" ]; then + run_test "nvmf_fc" ./test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT + run_test "spdkcli_nvmf_fc" ./test/spdkcli/nvmf.sh + else + echo "unknown NVMe transport, please specify rdma, tcp, or fc." + exit 1 + fi fi if [ $SPDK_TEST_VHOST -eq 1 ]; then