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

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

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

Reviewed-on: https://review.gerrithub.io/399749
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:09:42 -07:00
parent b6c8578a35
commit d998c1ad70
8 changed files with 17 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/unit/lib/scsi/dev.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 = log TEST_FILE = dev_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/test include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
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

4
test/unit/lib/scsi/dev.c/dev_ut.c
View File

@ -38,8 +38,8 @@
#include "spdk/util.h" #include "spdk/util.h"
#include "dev.c" #include "scsi/dev.c"
#include "port.c" #include "scsi/port.c"
/* Unit test bdev mockup */ /* Unit test bdev mockup */
struct spdk_bdev { struct spdk_bdev {

21
test/unit/lib/scsi/lun.c/Makefile
View File

@ -35,22 +35,7 @@ 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 = cunit log SPDK_LIB_LIST = cunit
TEST_FILE = lun_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/test include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
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

4
test/unit/lib/scsi/lun.c/lun_ut.c
View File

@ -35,8 +35,8 @@
#include "spdk_cunit.h" #include "spdk_cunit.h"
#include "task.c" #include "scsi/task.c"
#include "lun.c" #include "scsi/lun.c"
#include "spdk_internal/mock.h" #include "spdk_internal/mock.h"

21
test/unit/lib/scsi/scsi.c/Makefile
View File

@ -35,22 +35,7 @@ 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 = log conf trace util SPDK_LIB_LIST = trace
TEST_FILE = scsi_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
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

2
test/unit/lib/scsi/scsi.c/scsi_ut.c
View File

@ -37,7 +37,7 @@
#include "spdk_cunit.h" #include "spdk_cunit.h"
#include "scsi.c" #include "scsi/scsi.c"
static void static void
scsi_init(void) scsi_init(void)

20
test/unit/lib/scsi/scsi_bdev.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 = log util cunit TEST_FILE = scsi_bdev_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/test include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = scsi_bdev_ut
C_SRCS = scsi_bdev_ut.c
all: $(APP)
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

4
test/unit/lib/scsi/scsi_bdev.c/scsi_bdev_ut.c
View File

@ -33,8 +33,8 @@
#include "spdk/stdinc.h" #include "spdk/stdinc.h"
#include "task.c" #include "scsi/task.c"
#include "scsi_bdev.c" #include "scsi/scsi_bdev.c"
#include "spdk_cunit.h" #include "spdk_cunit.h"