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

test: use spdk.unittest.mk in bdev unit tests

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

Reviewed-on: https://review.gerrithub.io/399728
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 08:32:22 -07:00
parent 36b00b7f61
commit d8c3ff5fd6
12 changed files with 18 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,22 +34,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 cunit util
TEST_FILE = bdev_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = bdev_ut
C_SRCS = bdev_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

2
test/unit/lib/bdev/bdev.c/bdev_ut.c
View File

@ -38,7 +38,7 @@
/* HACK: disable VTune integration so the unit test doesn't need VTune headers and libs to build */
#undef SPDK_CONFIG_VTUNE
#include "bdev.c"
#include "bdev/bdev.c"
SPDK_DECLARE_BDEV_MODULE(vbdev_ut);

20
test/unit/lib/bdev/gpt/gpt.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.app.mk
SPDK_LIB_LIST = log cunit util
TEST_FILE = gpt_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = gpt_ut
C_SRCS = gpt_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

2
test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c
View File

@ -35,7 +35,7 @@
#include "lib/test_env.c"
#include "gpt/gpt.c"
#include "bdev/gpt/gpt.c"
static void
test_check_mbr(void)

20
test/unit/lib/bdev/mt/bdev.c/Makefile
View File

@ -36,22 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk
SPDK_LIB_LIST = log util spdk_mock
TEST_FILE = bdev_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = bdev_ut
C_SRCS = bdev_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

2
test/unit/lib/bdev/mt/bdev.c/bdev_ut.c
View File

@ -39,7 +39,7 @@
/* HACK: disable VTune integration so the unit test doesn't need VTune headers and libs to build */
#undef SPDK_CONFIG_VTUNE
#include "bdev.c"
#include "bdev/bdev.c"
#define BDEV_UT_NUM_THREADS 3

20
test/unit/lib/bdev/pmem/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.app.mk
SPDK_LIB_LIST = log cunit util
TEST_FILE = bdev_pmem_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = bdev_pmem_ut
C_SRCS = bdev_pmem_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

2
test/unit/lib/bdev/pmem/bdev_pmem_ut.c
View File

@ -35,7 +35,7 @@
#include "lib/test_env.c"
#include "pmem/bdev_pmem.c"
#include "bdev/pmem/bdev_pmem.c"
static struct spdk_bdev_module_if *g_bdev_pmem_module;
static int g_bdev_module_cnt;

20
test/unit/lib/bdev/scsi_nvme.c/Makefile
View File

@ -34,22 +34,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 cunit
TEST_FILE = scsi_nvme_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS += -lcunit
APP = scsi_nvme_ut
C_SRCS = scsi_nvme_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

2
test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut.c
View File

@ -32,7 +32,7 @@
#include "spdk_cunit.h"
#include "scsi_nvme.c"
#include "bdev/scsi_nvme.c"
static int
null_init(void)

21
test/unit/lib/bdev/vbdev_lvol.c/Makefile
View File

@ -35,23 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../../)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
APP = vbdev_lvol_ut
TEST_FILE = vbdev_lvol_ut.c
C_SRCS := vbdev_lvol_ut.c
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/lvol
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/lvol/bdev
SPDK_LIB_LIST = log util
LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit
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

2
test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
View File

@ -34,7 +34,7 @@
#include "spdk_cunit.h"
#include "spdk/string.h"
#include "vbdev_lvol.c"
#include "bdev/lvol/vbdev_lvol.c"
#define SPDK_BS_PAGE_SIZE 0x1000