From 24260d2a0deb88dad6eb4698a38aa0c56ac7338e Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Mon, 8 Jun 2020 07:36:31 -0400 Subject: [PATCH] test/cuse: fix conflicting name for cuse tests "nvme_cuse" name for run_test was already used by one of the tests in nvme.sh. This removes the naming conflict and will prepare for further restructure of nvme-cuse tests, where "nvme_cuse" name will encompass all cuse tests. Signed-off-by: Tomasz Zawadzki Change-Id: If141fe0ef492e0cde8e68490550de5d48fecb5e7 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2822 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Changpeng Liu Reviewed-by: Ben Walker --- autotest.sh | 2 +- test/nvme/cuse/{nvme_cuse.sh => nvme_cuse_rpc.sh} | 0 test/nvme/nvme.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename test/nvme/cuse/{nvme_cuse.sh => nvme_cuse_rpc.sh} (100%) diff --git a/autotest.sh b/autotest.sh index 3b52f41e4..2b045a2db 100755 --- a/autotest.sh +++ b/autotest.sh @@ -181,7 +181,7 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then fi if [[ $SPDK_TEST_NVME_CUSE -eq 1 ]]; then modprobe cuse - run_test "nvme_cuse" test/nvme/cuse/nvme_cuse.sh + run_test "nvme_cuse_rpc" test/nvme/cuse/nvme_cuse_rpc.sh run_test "nvme_cli_cuse" test/nvme/spdk_nvme_cli_cuse.sh run_test "nvme_smartctl_cuse" test/nvme/spdk_smartctl_cuse.sh run_test "nvme_ns_manage_cuse" test/nvme/nvme_ns_manage_cuse.sh diff --git a/test/nvme/cuse/nvme_cuse.sh b/test/nvme/cuse/nvme_cuse_rpc.sh similarity index 100% rename from test/nvme/cuse/nvme_cuse.sh rename to test/nvme/cuse/nvme_cuse_rpc.sh diff --git a/test/nvme/nvme.sh b/test/nvme/nvme.sh index 275df418c..15438790d 100755 --- a/test/nvme/nvme.sh +++ b/test/nvme/nvme.sh @@ -117,7 +117,7 @@ run_test "nvme_err_injection" $testdir/err_injection/err_injection run_test "nvme_overhead" $testdir/overhead/overhead -s 4096 -t 1 -H run_test "nvme_arbitration" $SPDK_EXAMPLE_DIR/arbitration -t 3 -i 0 if [ $SPDK_TEST_NVME_CUSE -eq 1 ]; then - run_test "nvme_cuse" $testdir/cuse/cuse + run_test "nvme_cuse_app" $testdir/cuse/cuse fi if [[ $CONFIG_FIO_PLUGIN == y ]]; then