Commit b6c8578a authored by Jim Harris's avatar Jim Harris
Browse files

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



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

Reviewed-on: https://review.gerrithub.io/399748


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent c3f8781f

test/unit/lib/lvol/lvol.c/Makefile

+2 −18
Original line number Diff line number Diff line
@@ -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

test/unit/lib/lvol/lvol.c/lvol_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

test/unit/lib/net/sock.c/Makefile

+2 −17
Original line number Diff line number Diff line
@@ -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

test/unit/lib/net/sock.c/sock_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -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;