From 70318fd2e66b670d85fbaf454ae4a9f48bc85a4e Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 19 Jun 2017 14:07:24 -0700 Subject: [PATCH] test: move NVMe-oF library tests to test/unit Change-Id: I363c5865d96af60ad6314b2e05d13c50f30d4002 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/366167 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- test/lib/Makefile | 2 +- test/unit/lib/Makefile | 2 +- test/{ => unit}/lib/nvmf/Makefile | 4 ++-- .../direct => unit/lib/nvmf/direct.c}/.gitignore | 0 .../nvmf/direct => unit/lib/nvmf/direct.c}/Makefile | 2 +- .../direct => unit/lib/nvmf/direct.c}/direct_ut.c | 0 .../lib/nvmf/discovery.c}/.gitignore | 0 .../discovery => unit/lib/nvmf/discovery.c}/Makefile | 2 +- .../lib/nvmf/discovery.c}/discovery_ut.c | 0 .../request => unit/lib/nvmf/request.c}/.gitignore | 0 .../request => unit/lib/nvmf/request.c}/Makefile | 2 +- .../request => unit/lib/nvmf/request.c}/request_ut.c | 0 .../session => unit/lib/nvmf/session.c}/.gitignore | 0 .../session => unit/lib/nvmf/session.c}/Makefile | 2 +- .../session => unit/lib/nvmf/session.c}/session_ut.c | 0 .../lib/nvmf/subsystem.c}/.gitignore | 0 .../subsystem => unit/lib/nvmf/subsystem.c}/Makefile | 2 +- .../lib/nvmf/subsystem.c}/subsystem_ut.c | 0 .../virtual => unit/lib/nvmf/virtual.c}/.gitignore | 0 .../virtual => unit/lib/nvmf/virtual.c}/Makefile | 2 +- .../virtual => unit/lib/nvmf/virtual.c}/virtual_ut.c | 0 unittest.sh | 12 ++++++------ 22 files changed, 16 insertions(+), 16 deletions(-) rename test/{ => unit}/lib/nvmf/Makefile (93%) rename test/{lib/nvmf/direct => unit/lib/nvmf/direct.c}/.gitignore (100%) rename test/{lib/nvmf/direct => unit/lib/nvmf/direct.c}/Makefile (96%) rename test/{lib/nvmf/direct => unit/lib/nvmf/direct.c}/direct_ut.c (100%) rename test/{lib/nvmf/discovery => unit/lib/nvmf/discovery.c}/.gitignore (100%) rename test/{lib/nvmf/discovery => unit/lib/nvmf/discovery.c}/Makefile (96%) rename test/{lib/nvmf/discovery => unit/lib/nvmf/discovery.c}/discovery_ut.c (100%) rename test/{lib/nvmf/request => unit/lib/nvmf/request.c}/.gitignore (100%) rename test/{lib/nvmf/request => unit/lib/nvmf/request.c}/Makefile (96%) rename test/{lib/nvmf/request => unit/lib/nvmf/request.c}/request_ut.c (100%) rename test/{lib/nvmf/session => unit/lib/nvmf/session.c}/.gitignore (100%) rename test/{lib/nvmf/session => unit/lib/nvmf/session.c}/Makefile (96%) rename test/{lib/nvmf/session => unit/lib/nvmf/session.c}/session_ut.c (100%) rename test/{lib/nvmf/subsystem => unit/lib/nvmf/subsystem.c}/.gitignore (100%) rename test/{lib/nvmf/subsystem => unit/lib/nvmf/subsystem.c}/Makefile (96%) rename test/{lib/nvmf/subsystem => unit/lib/nvmf/subsystem.c}/subsystem_ut.c (100%) rename test/{lib/nvmf/virtual => unit/lib/nvmf/virtual.c}/.gitignore (100%) rename test/{lib/nvmf/virtual => unit/lib/nvmf/virtual.c}/Makefile (96%) rename test/{lib/nvmf/virtual => unit/lib/nvmf/virtual.c}/virtual_ut.c (100%) diff --git a/test/lib/Makefile b/test/lib/Makefile index 782f7a709..7941b382c 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 = bdev blob blobfs env event ioat iscsi json log nvme nvmf +DIRS-y = bdev blob blobfs env event ioat iscsi json log nvme .PHONY: all clean $(DIRS-y) diff --git a/test/unit/lib/Makefile b/test/unit/lib/Makefile index 9700ae61f..74cadb719 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 nvme scsi util +DIRS-y = bdev json jsonrpc nvme nvmf scsi util .PHONY: all clean $(DIRS-y) diff --git a/test/lib/nvmf/Makefile b/test/unit/lib/nvmf/Makefile similarity index 93% rename from test/lib/nvmf/Makefile rename to test/unit/lib/nvmf/Makefile index f568dddb0..cd659cb12 100644 --- a/test/lib/nvmf/Makefile +++ b/test/unit/lib/nvmf/Makefile @@ -31,10 +31,10 @@ # 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 = direct discovery request session subsystem virtual +DIRS-y = direct.c discovery.c request.c session.c subsystem.c virtual.c .PHONY: all clean $(DIRS-y) diff --git a/test/lib/nvmf/direct/.gitignore b/test/unit/lib/nvmf/direct.c/.gitignore similarity index 100% rename from test/lib/nvmf/direct/.gitignore rename to test/unit/lib/nvmf/direct.c/.gitignore diff --git a/test/lib/nvmf/direct/Makefile b/test/unit/lib/nvmf/direct.c/Makefile similarity index 96% rename from test/lib/nvmf/direct/Makefile rename to test/unit/lib/nvmf/direct.c/Makefile index 1ff0f7c16..98d4645a2 100644 --- a/test/lib/nvmf/direct/Makefile +++ b/test/unit/lib/nvmf/direct.c/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)/../../../../..) TEST_FILE = direct_ut.c diff --git a/test/lib/nvmf/direct/direct_ut.c b/test/unit/lib/nvmf/direct.c/direct_ut.c similarity index 100% rename from test/lib/nvmf/direct/direct_ut.c rename to test/unit/lib/nvmf/direct.c/direct_ut.c diff --git a/test/lib/nvmf/discovery/.gitignore b/test/unit/lib/nvmf/discovery.c/.gitignore similarity index 100% rename from test/lib/nvmf/discovery/.gitignore rename to test/unit/lib/nvmf/discovery.c/.gitignore diff --git a/test/lib/nvmf/discovery/Makefile b/test/unit/lib/nvmf/discovery.c/Makefile similarity index 96% rename from test/lib/nvmf/discovery/Makefile rename to test/unit/lib/nvmf/discovery.c/Makefile index 7f5ee3b80..51cc570b3 100644 --- a/test/lib/nvmf/discovery/Makefile +++ b/test/unit/lib/nvmf/discovery.c/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)/../../../../..) TEST_FILE = discovery_ut.c OTHER_FILES = subsystem.c diff --git a/test/lib/nvmf/discovery/discovery_ut.c b/test/unit/lib/nvmf/discovery.c/discovery_ut.c similarity index 100% rename from test/lib/nvmf/discovery/discovery_ut.c rename to test/unit/lib/nvmf/discovery.c/discovery_ut.c diff --git a/test/lib/nvmf/request/.gitignore b/test/unit/lib/nvmf/request.c/.gitignore similarity index 100% rename from test/lib/nvmf/request/.gitignore rename to test/unit/lib/nvmf/request.c/.gitignore diff --git a/test/lib/nvmf/request/Makefile b/test/unit/lib/nvmf/request.c/Makefile similarity index 96% rename from test/lib/nvmf/request/Makefile rename to test/unit/lib/nvmf/request.c/Makefile index 2abb7cf37..4c0f50b0e 100644 --- a/test/lib/nvmf/request/Makefile +++ b/test/unit/lib/nvmf/request.c/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)/../../../../..) TEST_FILE = request_ut.c diff --git a/test/lib/nvmf/request/request_ut.c b/test/unit/lib/nvmf/request.c/request_ut.c similarity index 100% rename from test/lib/nvmf/request/request_ut.c rename to test/unit/lib/nvmf/request.c/request_ut.c diff --git a/test/lib/nvmf/session/.gitignore b/test/unit/lib/nvmf/session.c/.gitignore similarity index 100% rename from test/lib/nvmf/session/.gitignore rename to test/unit/lib/nvmf/session.c/.gitignore diff --git a/test/lib/nvmf/session/Makefile b/test/unit/lib/nvmf/session.c/Makefile similarity index 96% rename from test/lib/nvmf/session/Makefile rename to test/unit/lib/nvmf/session.c/Makefile index ba3f8edc0..1fdc75068 100644 --- a/test/lib/nvmf/session/Makefile +++ b/test/unit/lib/nvmf/session.c/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)/../../../../..) TEST_FILE = session_ut.c diff --git a/test/lib/nvmf/session/session_ut.c b/test/unit/lib/nvmf/session.c/session_ut.c similarity index 100% rename from test/lib/nvmf/session/session_ut.c rename to test/unit/lib/nvmf/session.c/session_ut.c diff --git a/test/lib/nvmf/subsystem/.gitignore b/test/unit/lib/nvmf/subsystem.c/.gitignore similarity index 100% rename from test/lib/nvmf/subsystem/.gitignore rename to test/unit/lib/nvmf/subsystem.c/.gitignore diff --git a/test/lib/nvmf/subsystem/Makefile b/test/unit/lib/nvmf/subsystem.c/Makefile similarity index 96% rename from test/lib/nvmf/subsystem/Makefile rename to test/unit/lib/nvmf/subsystem.c/Makefile index 8095f76cd..362156af1 100644 --- a/test/lib/nvmf/subsystem/Makefile +++ b/test/unit/lib/nvmf/subsystem.c/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)/../../../../..) TEST_FILE = subsystem_ut.c diff --git a/test/lib/nvmf/subsystem/subsystem_ut.c b/test/unit/lib/nvmf/subsystem.c/subsystem_ut.c similarity index 100% rename from test/lib/nvmf/subsystem/subsystem_ut.c rename to test/unit/lib/nvmf/subsystem.c/subsystem_ut.c diff --git a/test/lib/nvmf/virtual/.gitignore b/test/unit/lib/nvmf/virtual.c/.gitignore similarity index 100% rename from test/lib/nvmf/virtual/.gitignore rename to test/unit/lib/nvmf/virtual.c/.gitignore diff --git a/test/lib/nvmf/virtual/Makefile b/test/unit/lib/nvmf/virtual.c/Makefile similarity index 96% rename from test/lib/nvmf/virtual/Makefile rename to test/unit/lib/nvmf/virtual.c/Makefile index 8bd3e769e..e48523d11 100644 --- a/test/lib/nvmf/virtual/Makefile +++ b/test/unit/lib/nvmf/virtual.c/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)/../../../../..) TEST_FILE = virtual_ut.c diff --git a/test/lib/nvmf/virtual/virtual_ut.c b/test/unit/lib/nvmf/virtual.c/virtual_ut.c similarity index 100% rename from test/lib/nvmf/virtual/virtual_ut.c rename to test/unit/lib/nvmf/virtual.c/virtual_ut.c diff --git a/unittest.sh b/unittest.sh index 3119c2784..532ae1a63 100755 --- a/unittest.sh +++ b/unittest.sh @@ -57,12 +57,12 @@ $valgrind test/unit/lib/jsonrpc/jsonrpc_server.c/jsonrpc_server_ut $valgrind test/lib/log/log_ut -$valgrind test/lib/nvmf/discovery/discovery_ut -$valgrind test/lib/nvmf/request/request_ut -$valgrind test/lib/nvmf/session/session_ut -$valgrind test/lib/nvmf/subsystem/subsystem_ut -$valgrind test/lib/nvmf/direct/direct_ut -$valgrind test/lib/nvmf/virtual/virtual_ut +$valgrind test/unit/lib/nvmf/discovery.c/discovery_ut +$valgrind test/unit/lib/nvmf/request.c/request_ut +$valgrind test/unit/lib/nvmf/session.c/session_ut +$valgrind test/unit/lib/nvmf/subsystem.c/subsystem_ut +$valgrind test/unit/lib/nvmf/direct.c/direct_ut +$valgrind test/unit/lib/nvmf/virtual.c/virtual_ut $valgrind test/unit/lib/scsi/dev.c/dev_ut $valgrind test/unit/lib/scsi/lun.c/lun_ut