ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: use spdk.unittest.mk for lvol and net unit tests

Browse Source 
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>
This commit is contained in:
Jim Harris 2018-02-13 09:03:52 -07:00
parent c3f8781fc3
commit b6c8578a35
4 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/unit/lib/lvol/lvol.c/Makefile
View File

@ -35,22 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.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 include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
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

2
test/unit/lib/lvol/lvol.c/lvol_ut.c
View File

@ -38,7 +38,7 @@
#include "lib/test_env.c" #include "lib/test_env.c"
#include "lvol.c" #include "lvol/lvol.c"
#define DEV_BUFFER_SIZE (64 * 1024 * 1024) #define DEV_BUFFER_SIZE (64 * 1024 * 1024)
#define DEV_BUFFER_BLOCKLEN (4096) #define DEV_BUFFER_BLOCKLEN (4096)

19
test/unit/lib/net/sock.c/Makefile
View File

@ -35,21 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
CFLAGS += -I$(SPDK_ROOT_DIR)/test TEST_FILE = sock_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/net
APP = sock_ut include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
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

2
test/unit/lib/net/sock.c/sock_ut.c
View File

@ -35,7 +35,7 @@
#include "spdk_cunit.h" #include "spdk_cunit.h"
#include "sock.c" #include "net/sock.c"
bool g_read_data_called; bool g_read_data_called;
ssize_t g_bytes_read; ssize_t g_bytes_read;