From 02c1c5a69a40fb3d29e70796dc89d0efedcd935b Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Mon, 3 Jun 2019 12:26:47 -0700 Subject: [PATCH] test/nvmf: use --transport=rdma in nvmf.sh We also no longer hardcode TEST_TRANSPORT=rdma. Users of the individual test scripts must now explicitly pass --transport=rdma. Support for tcp will be coming in future patches. Signed-off-by: Jim Harris Change-Id: I819d69cb0906eb27b692eb2755aca5085298d779 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456685 Tested-by: SPDK CI Jenkins Reviewed-by: Seth Howell Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker --- test/common/autotest_common.sh | 1 - test/nvmf/common.sh | 4 ++++ test/nvmf/nvmf.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index e47d0ba24..b3042f377 100644 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -201,7 +201,6 @@ if [ -z "$output_dir" ]; then fi TEST_MODE= -TEST_TRANSPORT=rdma for i in "$@"; do case "$i" in --iso) diff --git a/test/nvmf/common.sh b/test/nvmf/common.sh index 614056c8a..a33c557b2 100755 --- a/test/nvmf/common.sh +++ b/test/nvmf/common.sh @@ -157,6 +157,10 @@ function nvmfcleanup() function nvmftestinit() { + if [ -z $TEST_TRANSPORT ]; then + echo "transport not specified - use --transport= to specify" + return 1 + fi if [ "$TEST_MODE" == "iso" ]; then $rootdir/scripts/setup.sh rdma_device_init diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh index 5a28ba2a9..5aa4d4763 100755 --- a/test/nvmf/nvmf.sh +++ b/test/nvmf/nvmf.sh @@ -13,7 +13,7 @@ timing_enter nvmf_tgt trap "exit 1" SIGINT SIGTERM EXIT -TEST_ARGS= +TEST_ARGS=--transport=rdma run_test suite test/nvmf/target/filesystem.sh $TEST_ARGS run_test suite test/nvmf/target/discovery.sh $TEST_ARGS