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

test: use spdk.unittest.mk for iscsi unit tests 



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

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


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

test/unit/lib/iscsi/conn.c/Makefile

+3 −17
Original line number Diff line number Diff line
@@ -35,22 +35,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk



SPDK_LIB_LIST = log cunit trace conf util

SPDK_LIB_LIST = trace



CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib

LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += -lcunit

TEST_FILE = conn_ut.c



APP = conn_ut

C_SRCS = conn_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/iscsi/init_grp.c/Makefile

+3 −18
Original line number Diff line number Diff line
@@ -35,22 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk



SPDK_LIB_LIST = log conf util cunit

SPDK_LIB_LIST = conf

TEST_FILE = init_grp_ut.c



CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib

LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += -lcunit



APP = init_grp_ut

C_SRCS = init_grp_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/iscsi/iscsi.c/Makefile

+6 −18
Original line number Diff line number Diff line
@@ -35,26 +35,14 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk



SPDK_LIB_LIST = log cunit trace conf util

SPDK_LIB_LIST = trace conf util



CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib

LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)

LIBS += -lcunit -lcrypto

SCSI_OBJS = port

ISCSI_OBJS = md5 param

OBJS += $(SCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/scsi/%.o)

OBJS += $(ISCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/iscsi/%.o)

LIBS += $(SCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/scsi/%.o)

LIBS += $(ISCSI_OBJS:%=$(SPDK_ROOT_DIR)/lib/iscsi/%.o)

LIBS += -lcunit -lcrypto $(ENV_LINKER_ARGS)



APP = iscsi_ut

C_SRCS = iscsi_ut.c

TEST_FILE = iscsi_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/iscsi/param.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 = log util cunit

TEST_FILE = param_ut.c



CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib

LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += -lcunit



APP = param_ut

C_SRCS = param_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/iscsi/portal_grp.c/Makefile

+3 −18
Original line number Diff line number Diff line
@@ -35,23 +35,8 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk



SPDK_LIB_LIST = log conf util cunit

SPDK_LIB_LIST = conf



CFLAGS += $(ENV_CFLAGS)

CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib

LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += -lcunit

TEST_FILE = portal_grp_ut.c



APP = portal_grp_ut

C_SRCS = portal_grp_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