From bba25f4a6ff35317e0d3fd7831446e1a139c8a6a Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 2 May 2019 16:45:41 -0700 Subject: [PATCH] test/nvmf: move target-related scripts to one directory This reduces the number of directories significantly. Signed-off-by: Jim Harris Change-Id: I2bb428962e1666bd3cee20fb566c7eb81195363a Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452934 Tested-by: SPDK CI Jenkins Reviewed-by: Seth Howell Reviewed-by: Changpeng Liu Reviewed-by: Ben Walker --- test/nvmf/nvmf.sh | 26 +++++++++---------- .../{bdev_io_wait => target}/bdev_io_wait.sh | 0 .../connect_disconnect.sh | 0 .../create_transport.sh | 0 test/nvmf/{discovery => target}/discovery.sh | 0 .../nvmf/{filesystem => target}/filesystem.sh | 0 test/nvmf/{fio => target}/fio.sh | 0 .../multiconnection.sh | 0 test/nvmf/{nmic => target}/nmic.sh | 0 test/nvmf/{nvme_cli => target}/nvme_cli.sh | 0 test/nvmf/{lvol => target}/nvmf_lvol.sh | 0 test/nvmf/{rpc => target}/rpc.sh | 0 test/nvmf/{shutdown => target}/shutdown.sh | 0 .../srq_overwhelm.sh | 0 14 files changed, 13 insertions(+), 13 deletions(-) rename test/nvmf/{bdev_io_wait => target}/bdev_io_wait.sh (100%) rename test/nvmf/{connect_disconnect => target}/connect_disconnect.sh (100%) rename test/nvmf/{create_transport => target}/create_transport.sh (100%) rename test/nvmf/{discovery => target}/discovery.sh (100%) rename test/nvmf/{filesystem => target}/filesystem.sh (100%) rename test/nvmf/{fio => target}/fio.sh (100%) rename test/nvmf/{multiconnection => target}/multiconnection.sh (100%) rename test/nvmf/{nmic => target}/nmic.sh (100%) rename test/nvmf/{nvme_cli => target}/nvme_cli.sh (100%) rename test/nvmf/{lvol => target}/nvmf_lvol.sh (100%) rename test/nvmf/{rpc => target}/rpc.sh (100%) rename test/nvmf/{shutdown => target}/shutdown.sh (100%) rename test/nvmf/{srq_overwhelm => target}/srq_overwhelm.sh (100%) diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh index deb4ea47b..fe6893b90 100755 --- a/test/nvmf/nvmf.sh +++ b/test/nvmf/nvmf.sh @@ -13,26 +13,26 @@ timing_enter nvmf_tgt trap "exit 1" SIGINT SIGTERM EXIT -run_test suite test/nvmf/filesystem/filesystem.sh -run_test suite test/nvmf/discovery/discovery.sh -run_test suite test/nvmf/connect_disconnect/connect_disconnect.sh +run_test suite test/nvmf/target/filesystem.sh +run_test suite test/nvmf/target/discovery.sh +run_test suite test/nvmf/target/connect_disconnect.sh if [ $SPDK_TEST_NVME_CLI -eq 1 ]; then - run_test suite test/nvmf/nvme_cli/nvme_cli.sh + run_test suite test/nvmf/target/nvme_cli.sh fi -run_test suite test/nvmf/lvol/nvmf_lvol.sh +run_test suite test/nvmf/target/nvmf_lvol.sh #TODO: disabled due to intermittent failures. Need to triage. -# run_test suite test/nvmf/srq_overwhelm/srq_overwhelm.sh -run_test suite test/nvmf/shutdown/shutdown.sh -run_test suite test/nvmf/bdev_io_wait/bdev_io_wait.sh -run_test suite test/nvmf/create_transport/create_transport.sh +# run_test suite test/nvmf/target/srq_overwhelm.sh +run_test suite test/nvmf/target/shutdown.sh +run_test suite test/nvmf/target/bdev_io_wait.sh +run_test suite test/nvmf/target/create_transport.sh if [ $RUN_NIGHTLY -eq 1 ]; then - run_test suite test/nvmf/multiconnection/multiconnection.sh + run_test suite test/nvmf/target/multiconnection.sh fi -run_test suite test/nvmf/nmic/nmic.sh -run_test suite test/nvmf/rpc/rpc.sh -run_test suite test/nvmf/fio/fio.sh +run_test suite test/nvmf/target/nmic.sh +run_test suite test/nvmf/target/rpc.sh +run_test suite test/nvmf/target/fio.sh timing_enter host diff --git a/test/nvmf/bdev_io_wait/bdev_io_wait.sh b/test/nvmf/target/bdev_io_wait.sh similarity index 100% rename from test/nvmf/bdev_io_wait/bdev_io_wait.sh rename to test/nvmf/target/bdev_io_wait.sh diff --git a/test/nvmf/connect_disconnect/connect_disconnect.sh b/test/nvmf/target/connect_disconnect.sh similarity index 100% rename from test/nvmf/connect_disconnect/connect_disconnect.sh rename to test/nvmf/target/connect_disconnect.sh diff --git a/test/nvmf/create_transport/create_transport.sh b/test/nvmf/target/create_transport.sh similarity index 100% rename from test/nvmf/create_transport/create_transport.sh rename to test/nvmf/target/create_transport.sh diff --git a/test/nvmf/discovery/discovery.sh b/test/nvmf/target/discovery.sh similarity index 100% rename from test/nvmf/discovery/discovery.sh rename to test/nvmf/target/discovery.sh diff --git a/test/nvmf/filesystem/filesystem.sh b/test/nvmf/target/filesystem.sh similarity index 100% rename from test/nvmf/filesystem/filesystem.sh rename to test/nvmf/target/filesystem.sh diff --git a/test/nvmf/fio/fio.sh b/test/nvmf/target/fio.sh similarity index 100% rename from test/nvmf/fio/fio.sh rename to test/nvmf/target/fio.sh diff --git a/test/nvmf/multiconnection/multiconnection.sh b/test/nvmf/target/multiconnection.sh similarity index 100% rename from test/nvmf/multiconnection/multiconnection.sh rename to test/nvmf/target/multiconnection.sh diff --git a/test/nvmf/nmic/nmic.sh b/test/nvmf/target/nmic.sh similarity index 100% rename from test/nvmf/nmic/nmic.sh rename to test/nvmf/target/nmic.sh diff --git a/test/nvmf/nvme_cli/nvme_cli.sh b/test/nvmf/target/nvme_cli.sh similarity index 100% rename from test/nvmf/nvme_cli/nvme_cli.sh rename to test/nvmf/target/nvme_cli.sh diff --git a/test/nvmf/lvol/nvmf_lvol.sh b/test/nvmf/target/nvmf_lvol.sh similarity index 100% rename from test/nvmf/lvol/nvmf_lvol.sh rename to test/nvmf/target/nvmf_lvol.sh diff --git a/test/nvmf/rpc/rpc.sh b/test/nvmf/target/rpc.sh similarity index 100% rename from test/nvmf/rpc/rpc.sh rename to test/nvmf/target/rpc.sh diff --git a/test/nvmf/shutdown/shutdown.sh b/test/nvmf/target/shutdown.sh similarity index 100% rename from test/nvmf/shutdown/shutdown.sh rename to test/nvmf/target/shutdown.sh diff --git a/test/nvmf/srq_overwhelm/srq_overwhelm.sh b/test/nvmf/target/srq_overwhelm.sh similarity index 100% rename from test/nvmf/srq_overwhelm/srq_overwhelm.sh rename to test/nvmf/target/srq_overwhelm.sh