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

test: use spdk.unittest.mk for lib/scsi unit tests 



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

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


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

test/unit/lib/scsi/dev.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

TEST_FILE = dev_ut.c



CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi

LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += -lcunit



APP = dev_ut

C_SRCS = dev_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/scsi/dev.c/dev_ut.c

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 


#include "spdk/util.h"



#include "dev.c"

#include "port.c"

#include "scsi/dev.c"

#include "scsi/port.c"



/* Unit test bdev mockup */

struct spdk_bdev {

test/unit/lib/scsi/lun.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 = cunit log

SPDK_LIB_LIST = cunit

TEST_FILE = lun_ut.c



CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi

LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += -lcunit



APP = lun_ut

C_SRCS = lun_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/scsi/lun.c/lun_ut.c

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 


#include "spdk_cunit.h"



#include "task.c"

#include "lun.c"

#include "scsi/task.c"

#include "scsi/lun.c"



#include "spdk_internal/mock.h"

test/unit/lib/scsi/scsi.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 trace util

SPDK_LIB_LIST = trace

TEST_FILE = scsi_ut.c



CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi

CFLAGS += -I$(SPDK_ROOT_DIR)/test

LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)

LIBS += -lcunit



APP = scsi_ut

C_SRCS = scsi_ut.c



all: $(APP)



$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)

	$(LINK_C)



clean:

	$(CLEAN_C) $(APP)



include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk