test: move NVMe-oF library tests to test/unit

Change-Id: I363c5865d96af60ad6314b2e05d13c50f30d4002
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/366167
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>

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)
 

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)
 

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)
 

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
 

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

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
 

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
 

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
 

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
 

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