diff --git a/autotest.sh b/autotest.sh index 2254d2f2c..94aa6e1c7 100755 --- a/autotest.sh +++ b/autotest.sh @@ -105,13 +105,13 @@ if [ $SPDK_TEST_EVENT -eq 1 ]; then fi if [ $SPDK_TEST_NVME -eq 1 ]; then - run_test test/lib/nvme/nvme.sh - run_test test/lib/nvme/spdk_nvme_cli.sh + run_test test/nvme/nvme.sh + run_test test/nvme/spdk_nvme_cli.sh # Only test hotplug without ASAN enabled. Since if it is # enabled, it catches SEGV earlier than our handler which # breaks the hotplug logic if [ $SPDK_RUN_ASAN -eq 0 ]; then - run_test test/lib/nvme/hotplug.sh intel + run_test test/nvme/hotplug.sh intel fi fi diff --git a/doc/vagrant.md b/doc/vagrant.md index b5136a7e1..60febfa69 100644 --- a/doc/vagrant.md +++ b/doc/vagrant.md @@ -167,7 +167,7 @@ Bringing machine 'default' up with 'virtualbox' provider... ==> default: CC lib/blob/blobstore.o ==> default: CC lib/bdev/bdev.o << some output trimmed >> -==> default: LINK test/lib/nvme/e2edp/nvme_dp +==> default: LINK test/nvme/e2edp/nvme_dp ==> default: Running provisioner: shell... default: Running: inline script ==> default: 0000:00:0e.0 (80ee 4e56): nvme -> uio_pci_generic diff --git a/test/Makefile b/test/Makefile index e4b308359..ed024023f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk # These directories contain tests. -TESTDIRS = app bdev blobfs cpp_headers lib unit +TESTDIRS = app bdev blobfs cpp_headers lib nvme unit DIRS-y = $(TESTDIRS) diff --git a/test/lib/Makefile b/test/lib/Makefile index 638dd5dae..eb6dc6530 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = env event json nvme +DIRS-y = env event json .PHONY: all clean $(DIRS-y) diff --git a/test/lib/nvme/Makefile b/test/nvme/Makefile similarity index 97% rename from test/lib/nvme/Makefile rename to test/nvme/Makefile index 0834e5726..2a8236682 100644 --- a/test/lib/nvme/Makefile +++ b/test/nvme/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = aer reset sgl e2edp overhead deallocated_value diff --git a/test/lib/nvme/aer/.gitignore b/test/nvme/aer/.gitignore similarity index 100% rename from test/lib/nvme/aer/.gitignore rename to test/nvme/aer/.gitignore diff --git a/test/lib/nvme/aer/Makefile b/test/nvme/aer/Makefile similarity index 97% rename from test/lib/nvme/aer/Makefile rename to test/nvme/aer/Makefile index 7624693c9..77acabd06 100644 --- a/test/lib/nvme/aer/Makefile +++ b/test/nvme/aer/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = aer diff --git a/test/lib/nvme/aer/aer.c b/test/nvme/aer/aer.c similarity index 100% rename from test/lib/nvme/aer/aer.c rename to test/nvme/aer/aer.c diff --git a/test/lib/nvme/deallocated_value/.gitignore b/test/nvme/deallocated_value/.gitignore similarity index 100% rename from test/lib/nvme/deallocated_value/.gitignore rename to test/nvme/deallocated_value/.gitignore diff --git a/test/lib/nvme/deallocated_value/Makefile b/test/nvme/deallocated_value/Makefile similarity index 97% rename from test/lib/nvme/deallocated_value/Makefile rename to test/nvme/deallocated_value/Makefile index 92307fd9d..bff11cada 100644 --- a/test/lib/nvme/deallocated_value/Makefile +++ b/test/nvme/deallocated_value/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = deallocated_value diff --git a/test/lib/nvme/deallocated_value/deallocated_value.c b/test/nvme/deallocated_value/deallocated_value.c similarity index 100% rename from test/lib/nvme/deallocated_value/deallocated_value.c rename to test/nvme/deallocated_value/deallocated_value.c diff --git a/test/lib/nvme/e2edp/.gitignore b/test/nvme/e2edp/.gitignore similarity index 100% rename from test/lib/nvme/e2edp/.gitignore rename to test/nvme/e2edp/.gitignore diff --git a/test/lib/nvme/e2edp/Makefile b/test/nvme/e2edp/Makefile similarity index 97% rename from test/lib/nvme/e2edp/Makefile rename to test/nvme/e2edp/Makefile index a4986e540..226a50e04 100644 --- a/test/lib/nvme/e2edp/Makefile +++ b/test/nvme/e2edp/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = nvme_dp diff --git a/test/lib/nvme/e2edp/nvme_dp.c b/test/nvme/e2edp/nvme_dp.c similarity index 100% rename from test/lib/nvme/e2edp/nvme_dp.c rename to test/nvme/e2edp/nvme_dp.c diff --git a/test/lib/nvme/hotplug.sh b/test/nvme/hotplug.sh similarity index 98% rename from test/lib/nvme/hotplug.sh rename to test/nvme/hotplug.sh index ef6af6545..b6e8f250d 100755 --- a/test/lib/nvme/hotplug.sh +++ b/test/nvme/hotplug.sh @@ -3,7 +3,7 @@ set -xe testdir=$(readlink -f $(dirname $0)) -rootdir=$(readlink -f $testdir/../../..) +rootdir=$(readlink -f $testdir/../..) source $rootdir/test/common/autotest_common.sh function ssh_vm() { diff --git a/test/lib/nvme/nvme.sh b/test/nvme/nvme.sh similarity index 98% rename from test/lib/nvme/nvme.sh rename to test/nvme/nvme.sh index 04f07faad..59d2a261f 100755 --- a/test/lib/nvme/nvme.sh +++ b/test/nvme/nvme.sh @@ -3,7 +3,7 @@ set -e testdir=$(readlink -f $(dirname $0)) -rootdir=$(readlink -f $testdir/../../..) +rootdir=$(readlink -f $testdir/../..) source $rootdir/scripts/common.sh source $rootdir/test/common/autotest_common.sh @@ -140,7 +140,7 @@ $testdir/e2edp/nvme_dp timing_exit e2edp timing_enter overhead -$rootdir/test/lib/nvme/overhead/overhead -s 4096 -t 1 -H +$testdir/overhead/overhead -s 4096 -t 1 -H timing_exit overhead timing_enter arbitration diff --git a/test/lib/nvme/overhead/.gitignore b/test/nvme/overhead/.gitignore similarity index 100% rename from test/lib/nvme/overhead/.gitignore rename to test/nvme/overhead/.gitignore diff --git a/test/lib/nvme/overhead/Makefile b/test/nvme/overhead/Makefile similarity index 97% rename from test/lib/nvme/overhead/Makefile rename to test/nvme/overhead/Makefile index 8d0c1e00e..21dfe05f6 100644 --- a/test/lib/nvme/overhead/Makefile +++ b/test/nvme/overhead/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = overhead diff --git a/test/lib/nvme/overhead/README b/test/nvme/overhead/README similarity index 100% rename from test/lib/nvme/overhead/README rename to test/nvme/overhead/README diff --git a/test/lib/nvme/overhead/overhead.c b/test/nvme/overhead/overhead.c similarity index 100% rename from test/lib/nvme/overhead/overhead.c rename to test/nvme/overhead/overhead.c diff --git a/test/lib/nvme/reset/.gitignore b/test/nvme/reset/.gitignore similarity index 100% rename from test/lib/nvme/reset/.gitignore rename to test/nvme/reset/.gitignore diff --git a/test/lib/nvme/reset/Makefile b/test/nvme/reset/Makefile similarity index 97% rename from test/lib/nvme/reset/Makefile rename to test/nvme/reset/Makefile index ebe318f8d..440f385c3 100644 --- a/test/lib/nvme/reset/Makefile +++ b/test/nvme/reset/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = reset diff --git a/test/lib/nvme/reset/reset.c b/test/nvme/reset/reset.c similarity index 100% rename from test/lib/nvme/reset/reset.c rename to test/nvme/reset/reset.c diff --git a/test/lib/nvme/sgl/.gitignore b/test/nvme/sgl/.gitignore similarity index 100% rename from test/lib/nvme/sgl/.gitignore rename to test/nvme/sgl/.gitignore diff --git a/test/lib/nvme/sgl/Makefile b/test/nvme/sgl/Makefile similarity index 97% rename from test/lib/nvme/sgl/Makefile rename to test/nvme/sgl/Makefile index 223df2d49..f0e0fc508 100644 --- a/test/lib/nvme/sgl/Makefile +++ b/test/nvme/sgl/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = sgl diff --git a/test/lib/nvme/sgl/sgl.c b/test/nvme/sgl/sgl.c similarity index 100% rename from test/lib/nvme/sgl/sgl.c rename to test/nvme/sgl/sgl.c diff --git a/test/lib/nvme/spdk_nvme_cli.sh b/test/nvme/spdk_nvme_cli.sh similarity index 96% rename from test/lib/nvme/spdk_nvme_cli.sh rename to test/nvme/spdk_nvme_cli.sh index 5227c799e..a3cff6d7d 100755 --- a/test/lib/nvme/spdk_nvme_cli.sh +++ b/test/nvme/spdk_nvme_cli.sh @@ -3,7 +3,7 @@ set -ex testdir=$(readlink -f $(dirname $0)) -rootdir=$(readlink -f $testdir/../../..) +rootdir=$(readlink -f $testdir/../..) source $rootdir/scripts/common.sh source $rootdir/test/common/autotest_common.sh spdk_nvme_cli="/home/sys_sgsw/nvme-cli" diff --git a/test/nvmf/host/aer.sh b/test/nvmf/host/aer.sh index 4ce90afce..05e200266 100755 --- a/test/nvmf/host/aer.sh +++ b/test/nvmf/host/aer.sh @@ -30,7 +30,7 @@ timing_exit start_nvmf_tgt bdevs="$bdevs $($rpc_py construct_malloc_bdev 64 512)" $rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" '' -a -s SPDK00000000000001 -n "$bdevs" -$rootdir/test/lib/nvme/aer/aer -r "\ +$rootdir/test/nvme/aer/aer -r "\ trtype:RDMA \ adrfam:IPv4 \ traddr:$NVMF_FIRST_TARGET_IP \