test: move NVMe library tests to test/unit

Change-Id: I9fda95d47a6d7a5ad94de438805d88961ceef8cf Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-on: https://review.gerrithub.io/366166 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2017-06-19 13:58:25 -07:00 · 2017-06-19 13:58:25 -07:00 · fe13f87926
commit fe13f87926
parent 6f7bf9314b
28 changed files with 11 additions and 12 deletions
--- 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)

--- 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)

--- a/test/unit/lib/nvme/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)

--- a/test/unit/lib/nvme/nvme.c/.gitignore
+++ b/test/unit/lib/nvme/nvme.c/.gitignore
--- a/test/unit/lib/nvme/nvme.c/Makefile
+++ b/test/unit/lib/nvme/nvme.c/Makefile
--- a/test/unit/lib/nvme/nvme.c/nvme_ut.c
+++ b/test/unit/lib/nvme/nvme.c/nvme_ut.c
--- a/test/unit/lib/nvme/nvme_ctrlr.c/.gitignore
+++ b/test/unit/lib/nvme/nvme_ctrlr.c/.gitignore
--- a/test/unit/lib/nvme/nvme_ctrlr.c/Makefile
+++ b/test/unit/lib/nvme/nvme_ctrlr.c/Makefile
--- a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
+++ b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c
--- a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/.gitignore
+++ b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/.gitignore
--- a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile
+++ b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/Makefile
--- a/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c
+++ b/test/unit/lib/nvme/nvme_ctrlr_cmd.c/nvme_ctrlr_cmd_ut.c
--- a/test/unit/lib/nvme/nvme_ns.c/.gitignore
+++ b/test/unit/lib/nvme/nvme_ns.c/.gitignore
--- a/test/unit/lib/nvme/nvme_ns.c/Makefile
+++ b/test/unit/lib/nvme/nvme_ns.c/Makefile
--- a/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c
+++ b/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c
--- a/test/unit/lib/nvme/nvme_ns_cmd.c/.gitignore
+++ b/test/unit/lib/nvme/nvme_ns_cmd.c/.gitignore
--- a/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile
+++ b/test/unit/lib/nvme/nvme_ns_cmd.c/Makefile
--- a/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
+++ b/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c
--- a/test/unit/lib/nvme/nvme_pcie.c/.gitignore
+++ b/test/unit/lib/nvme/nvme_pcie.c/.gitignore
--- a/test/unit/lib/nvme/nvme_pcie.c/Makefile
+++ b/test/unit/lib/nvme/nvme_pcie.c/Makefile
--- a/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
+++ b/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c
--- a/test/unit/lib/nvme/nvme_qpair.c/.gitignore
+++ b/test/unit/lib/nvme/nvme_qpair.c/.gitignore
--- a/test/unit/lib/nvme/nvme_qpair.c/Makefile
+++ b/test/unit/lib/nvme/nvme_qpair.c/Makefile
--- a/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c
+++ b/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c
--- a/test/unit/lib/nvme/nvme_quirks.c/.gitignore
+++ b/test/unit/lib/nvme/nvme_quirks.c/.gitignore
--- a/test/unit/lib/nvme/nvme_quirks.c/Makefile
+++ b/test/unit/lib/nvme/nvme_quirks.c/Makefile
--- a/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
+++ b/test/unit/lib/nvme/nvme_quirks.c/nvme_quirks_ut.c
--- 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