diff --git a/test/lib/nvme/Makefile b/test/lib/nvme/Makefile index f7c274272..a5e918c9e 100644 --- a/test/lib/nvme/Makefile +++ b/test/lib/nvme/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = unit aer reset sgl e2edp overhead +DIRS-y = aer reset sgl e2edp overhead .PHONY: all clean $(DIRS-y) diff --git a/test/unit/lib/Makefile b/test/unit/lib/Makefile index 287de59f7..9700ae61f 100644 --- a/test/unit/lib/Makefile +++ b/test/unit/lib/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = bdev json jsonrpc scsi util +DIRS-y = bdev json jsonrpc nvme scsi util .PHONY: all clean $(DIRS-y) diff --git a/test/lib/nvme/unit/Makefile b/test/unit/lib/nvme/Makefile similarity index 93% rename from test/lib/nvme/unit/Makefile rename to test/unit/lib/nvme/Makefile index 7e98af693..063ee2630 100644 --- a/test/lib/nvme/unit/Makefile +++ b/test/unit/lib/nvme/Makefile @@ -34,8 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = nvme_c nvme_ns_cmd_c nvme_qpair_c nvme_ctrlr_c \ - nvme_ctrlr_cmd_c nvme_pcie_c nvme_quirks_c nvme_ns_c +DIRS-y = nvme.c nvme_ctrlr.c nvme_ctrlr_cmd.c nvme_ns.c nvme_ns_cmd.c nvme_pcie.c nvme_qpair.c nvme_quirks.c .PHONY: all clean $(DIRS-y) diff --git a/test/lib/nvme/unit/nvme_c/.gitignore b/test/unit/lib/nvme/nvme.c/.gitignore similarity index 100% rename from test/lib/nvme/unit/nvme_c/.gitignore rename to test/unit/lib/nvme/nvme.c/.gitignore diff --git a/test/lib/nvme/unit/nvme_c/Makefile b/test/unit/lib/nvme/nvme.c/Makefile similarity index 100% rename from test/lib/nvme/unit/nvme_c/Makefile rename to test/unit/lib/nvme/nvme.c/Makefile diff --git a/test/lib/nvme/unit/nvme_c/nvme_ut.c b/test/unit/lib/nvme/nvme.c/nvme_ut.c similarity index 100% rename from test/lib/nvme/unit/nvme_c/nvme_ut.c rename to test/unit/lib/nvme/nvme.c/nvme_ut.c diff --git a/test/lib/nvme/unit/nvme_ctrlr_c/.gitignore b/test/unit/lib/nvme/nvme_ctrlr.c/.gitignore similarity index 100% rename from test/lib/nvme/unit/nvme_ctrlr_c/.gitignore rename to test/unit/lib/nvme/nvme_ctrlr.c/.gitignore diff --git a/test/lib/nvme/unit/nvme_ctrlr_c/Makefile b/test/unit/lib/nvme/nvme_ctrlr.c/Makefile similarity index 100% rename from test/lib/nvme/unit/nvme_ctrlr_c/Makefile rename to test/unit/lib/nvme/nvme_ctrlr.c/Makefile diff --git a/test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c similarity index 100% rename from test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c rename to test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c diff --git a/test/lib/nvme/unit/nvme_ctrlr_cmd_c/.gitignore b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/.gitignore similarity index 100% rename from test/lib/nvme/unit/nvme_ctrlr_cmd_c/.gitignore rename to test/unit/lib/nvme/nvme_ctrlr_cmd.c/.gitignore diff --git a/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile similarity index 100% rename from test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile rename to test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile diff --git a/test/lib/nvme/unit/nvme_ctrlr_cmd_c/nvme_ctrlr_cmd_ut.c b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c similarity index 100% rename from test/lib/nvme/unit/nvme_ctrlr_cmd_c/nvme_ctrlr_cmd_ut.c rename to test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c diff --git a/test/lib/nvme/unit/nvme_ns_c/.gitignore b/test/unit/lib/nvme/nvme_ns.c/.gitignore similarity index 100% rename from test/lib/nvme/unit/nvme_ns_c/.gitignore rename to test/unit/lib/nvme/nvme_ns.c/.gitignore diff --git a/test/lib/nvme/unit/nvme_ns_c/Makefile b/test/unit/lib/nvme/nvme_ns.c/Makefile similarity index 100% rename from test/lib/nvme/unit/nvme_ns_c/Makefile rename to test/unit/lib/nvme/nvme_ns.c/Makefile diff --git a/test/lib/nvme/unit/nvme_ns_c/nvme_ns_ut.c b/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c similarity index 100% rename from test/lib/nvme/unit/nvme_ns_c/nvme_ns_ut.c rename to test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c diff --git a/test/lib/nvme/unit/nvme_ns_cmd_c/.gitignore b/test/unit/lib/nvme/nvme_ns_cmd.c/.gitignore similarity index 100% rename from test/lib/nvme/unit/nvme_ns_cmd_c/.gitignore rename to test/unit/lib/nvme/nvme_ns_cmd.c/.gitignore diff --git a/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile b/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile similarity index 100% rename from test/lib/nvme/unit/nvme_ns_cmd_c/Makefile rename to test/unit/lib/nvme/nvme_ns_cmd.c/Makefile diff --git a/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c b/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c similarity index 100% rename from test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c rename to test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c diff --git a/test/lib/nvme/unit/nvme_pcie_c/.gitignore b/test/unit/lib/nvme/nvme_pcie.c/.gitignore similarity index 100% rename from test/lib/nvme/unit/nvme_pcie_c/.gitignore rename to test/unit/lib/nvme/nvme_pcie.c/.gitignore diff --git a/test/lib/nvme/unit/nvme_pcie_c/Makefile b/test/unit/lib/nvme/nvme_pcie.c/Makefile similarity index 100% rename from test/lib/nvme/unit/nvme_pcie_c/Makefile rename to test/unit/lib/nvme/nvme_pcie.c/Makefile diff --git a/test/lib/nvme/unit/nvme_pcie_c/nvme_pcie_ut.c b/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c similarity index 100% rename from test/lib/nvme/unit/nvme_pcie_c/nvme_pcie_ut.c rename to test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c diff --git a/test/lib/nvme/unit/nvme_qpair_c/.gitignore b/test/unit/lib/nvme/nvme_qpair.c/.gitignore similarity index 100% rename from test/lib/nvme/unit/nvme_qpair_c/.gitignore rename to test/unit/lib/nvme/nvme_qpair.c/.gitignore diff --git a/test/lib/nvme/unit/nvme_qpair_c/Makefile b/test/unit/lib/nvme/nvme_qpair.c/Makefile similarity index 100% rename from test/lib/nvme/unit/nvme_qpair_c/Makefile rename to test/unit/lib/nvme/nvme_qpair.c/Makefile diff --git a/test/lib/nvme/unit/nvme_qpair_c/nvme_qpair_ut.c b/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c similarity index 100% rename from test/lib/nvme/unit/nvme_qpair_c/nvme_qpair_ut.c rename to test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c diff --git a/test/lib/nvme/unit/nvme_quirks_c/.gitignore b/test/unit/lib/nvme/nvme_quirks.c/.gitignore similarity index 100% rename from test/lib/nvme/unit/nvme_quirks_c/.gitignore rename to test/unit/lib/nvme/nvme_quirks.c/.gitignore diff --git a/test/lib/nvme/unit/nvme_quirks_c/Makefile b/test/unit/lib/nvme/nvme_quirks.c/Makefile similarity index 100% rename from test/lib/nvme/unit/nvme_quirks_c/Makefile rename to test/unit/lib/nvme/nvme_quirks.c/Makefile diff --git a/test/lib/nvme/unit/nvme_quirks_c/nvme_quirks_ut.c b/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c similarity index 100% rename from test/lib/nvme/unit/nvme_quirks_c/nvme_quirks_ut.c rename to test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c diff --git a/unittest.sh b/unittest.sh index ccfcbc6b3..3119c2784 100755 --- a/unittest.sh +++ b/unittest.sh @@ -38,14 +38,14 @@ $valgrind test/lib/blobfs/blobfs_async_ut/blobfs_async_ut # blobfs_sync_ut hangs when run under valgrind, so don't use $valgrind test/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut -$valgrind test/lib/nvme/unit/nvme_c/nvme_ut -$valgrind test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut -$valgrind test/lib/nvme/unit/nvme_ctrlr_cmd_c/nvme_ctrlr_cmd_ut -$valgrind test/lib/nvme/unit/nvme_ns_c/nvme_ns_ut -$valgrind test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut -$valgrind test/lib/nvme/unit/nvme_qpair_c/nvme_qpair_ut -$valgrind test/lib/nvme/unit/nvme_pcie_c/nvme_pcie_ut -$valgrind test/lib/nvme/unit/nvme_quirks_c/nvme_quirks_ut +$valgrind test/unit/lib/nvme/nvme.c/nvme_ut +$valgrind test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut +$valgrind test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut +$valgrind test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut +$valgrind test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut +$valgrind test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut +$valgrind test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut +$valgrind test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut $valgrind test/lib/ioat/unit/ioat_ut