From b6c8578a35c3d016e6bb926fcbd4aa9a2c5dc87d Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Tue, 13 Feb 2018 09:03:52 -0700
Subject: [PATCH] test: use spdk.unittest.mk for lvol and net unit tests

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Iac7fe5d4fb816692bda92766002dcb910bb4e558

Reviewed-on: https://review.gerrithub.io/399748
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
---
 test/unit/lib/lvol/lvol.c/Makefile  | 20 ++------------------
 test/unit/lib/lvol/lvol.c/lvol_ut.c |  2 +-
 test/unit/lib/net/sock.c/Makefile   | 19 ++-----------------
 test/unit/lib/net/sock.c/sock_ut.c  |  2 +-
 4 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/test/unit/lib/lvol/lvol.c/Makefile b/test/unit/lib/lvol/lvol.c/Makefile
index 71123992e..917f4ef60 100644
--- a/test/unit/lib/lvol/lvol.c/Makefile
+++ b/test/unit/lib/lvol/lvol.c/Makefile
@@ -35,22 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
-SPDK_LIB_LIST = util log
+TEST_FILE = lvol_ut.c
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/lvol
-LIBS += $(SPDK_LIB_LINKER_ARGS)
-LIBS += -lcunit
-
-APP = lvol_ut
-C_SRCS := lvol_ut.c
-
-all : $(APP)
-
-$(APP) : $(OBJS) $(SPDK_LIB_FILES)
-	$(LINK_C)
-
-clean :
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/lvol/lvol.c/lvol_ut.c b/test/unit/lib/lvol/lvol.c/lvol_ut.c
index 314ababd1..d14b382f9 100644
--- a/test/unit/lib/lvol/lvol.c/lvol_ut.c
+++ b/test/unit/lib/lvol/lvol.c/lvol_ut.c
@@ -38,7 +38,7 @@
 
 #include "lib/test_env.c"
 
-#include "lvol.c"
+#include "lvol/lvol.c"
 
 #define DEV_BUFFER_SIZE (64 * 1024 * 1024)
 #define DEV_BUFFER_BLOCKLEN (4096)
diff --git a/test/unit/lib/net/sock.c/Makefile b/test/unit/lib/net/sock.c/Makefile
index 85f495446..845c9aded 100644
--- a/test/unit/lib/net/sock.c/Makefile
+++ b/test/unit/lib/net/sock.c/Makefile
@@ -35,21 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
 
-CFLAGS += -I$(SPDK_ROOT_DIR)/test
-CFLAGS += -I$(SPDK_ROOT_DIR)/lib/net
+TEST_FILE = sock_ut.c
 
-APP = sock_ut
-C_SRCS := sock_ut.c
-
-SPDK_LIB_LIST = log util
-LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit
-
-all : $(APP)
-
-$(APP) : $(OBJS) $(SPDK_LIBS)
-	$(LINK_C)
-
-clean :
-	$(CLEAN_C) $(APP)
-
-include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
+include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
diff --git a/test/unit/lib/net/sock.c/sock_ut.c b/test/unit/lib/net/sock.c/sock_ut.c
index 284c3830d..432a11327 100644
--- a/test/unit/lib/net/sock.c/sock_ut.c
+++ b/test/unit/lib/net/sock.c/sock_ut.c
@@ -35,7 +35,7 @@
 
 #include "spdk_cunit.h"
 
-#include "sock.c"
+#include "net/sock.c"
 
 bool g_read_data_called;
 ssize_t g_bytes_read;