From d8c3ff5fd661c5e5a2ef975ce3849a56a813188f Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 13 Feb 2018 08:32:22 -0700 Subject: [PATCH] test: use spdk.unittest.mk in bdev unit tests Signed-off-by: Jim Harris Change-Id: I4b0704021bc8e9ccbc6ed6ce7ac8eb1efad4a561 Reviewed-on: https://review.gerrithub.io/399728 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp --- test/unit/lib/bdev/bdev.c/Makefile | 20 ++---------------- test/unit/lib/bdev/bdev.c/bdev_ut.c | 2 +- test/unit/lib/bdev/gpt/gpt.c/Makefile | 20 ++---------------- test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c | 2 +- test/unit/lib/bdev/mt/bdev.c/Makefile | 20 ++---------------- test/unit/lib/bdev/mt/bdev.c/bdev_ut.c | 2 +- test/unit/lib/bdev/pmem/Makefile | 20 ++---------------- test/unit/lib/bdev/pmem/bdev_pmem_ut.c | 2 +- test/unit/lib/bdev/scsi_nvme.c/Makefile | 20 ++---------------- test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut.c | 2 +- test/unit/lib/bdev/vbdev_lvol.c/Makefile | 21 ++----------------- .../lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c | 2 +- 12 files changed, 18 insertions(+), 115 deletions(-) diff --git a/test/unit/lib/bdev/bdev.c/Makefile b/test/unit/lib/bdev/bdev.c/Makefile index 6d49c767e..384fa27ae 100644 --- a/test/unit/lib/bdev/bdev.c/Makefile +++ b/test/unit/lib/bdev/bdev.c/Makefile @@ -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 diff --git a/test/unit/lib/bdev/bdev.c/bdev_ut.c b/test/unit/lib/bdev/bdev.c/bdev_ut.c index 070df2270..35f01cd02 100644 --- a/test/unit/lib/bdev/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/bdev.c/bdev_ut.c @@ -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); diff --git a/test/unit/lib/bdev/gpt/gpt.c/Makefile b/test/unit/lib/bdev/gpt/gpt.c/Makefile index 48f50cbed..ad21ea2ad 100644 --- a/test/unit/lib/bdev/gpt/gpt.c/Makefile +++ b/test/unit/lib/bdev/gpt/gpt.c/Makefile @@ -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 diff --git a/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c b/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c index 443f4969d..e31bd1267 100644 --- a/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c +++ b/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c @@ -35,7 +35,7 @@ #include "lib/test_env.c" -#include "gpt/gpt.c" +#include "bdev/gpt/gpt.c" static void test_check_mbr(void) diff --git a/test/unit/lib/bdev/mt/bdev.c/Makefile b/test/unit/lib/bdev/mt/bdev.c/Makefile index 24df2d8cc..96b485742 100644 --- a/test/unit/lib/bdev/mt/bdev.c/Makefile +++ b/test/unit/lib/bdev/mt/bdev.c/Makefile @@ -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 diff --git a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c index ef9303005..6c6627127 100644 --- a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c @@ -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 diff --git a/test/unit/lib/bdev/pmem/Makefile b/test/unit/lib/bdev/pmem/Makefile index 97a61aedd..9c0e7dc1e 100644 --- a/test/unit/lib/bdev/pmem/Makefile +++ b/test/unit/lib/bdev/pmem/Makefile @@ -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 diff --git a/test/unit/lib/bdev/pmem/bdev_pmem_ut.c b/test/unit/lib/bdev/pmem/bdev_pmem_ut.c index 1d98dab1f..676f99935 100644 --- a/test/unit/lib/bdev/pmem/bdev_pmem_ut.c +++ b/test/unit/lib/bdev/pmem/bdev_pmem_ut.c @@ -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; diff --git a/test/unit/lib/bdev/scsi_nvme.c/Makefile b/test/unit/lib/bdev/scsi_nvme.c/Makefile index b88da44f5..0c9081483 100644 --- a/test/unit/lib/bdev/scsi_nvme.c/Makefile +++ b/test/unit/lib/bdev/scsi_nvme.c/Makefile @@ -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 diff --git a/test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut.c b/test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut.c index ed1c64890..59f30d45c 100644 --- a/test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut.c +++ b/test/unit/lib/bdev/scsi_nvme.c/scsi_nvme_ut.c @@ -32,7 +32,7 @@ #include "spdk_cunit.h" -#include "scsi_nvme.c" +#include "bdev/scsi_nvme.c" static int null_init(void) diff --git a/test/unit/lib/bdev/vbdev_lvol.c/Makefile b/test/unit/lib/bdev/vbdev_lvol.c/Makefile index 03a4eca21..c2e6b99e3 100644 --- a/test/unit/lib/bdev/vbdev_lvol.c/Makefile +++ b/test/unit/lib/bdev/vbdev_lvol.c/Makefile @@ -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 diff --git a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c index 4f89b3e6d..5893588af 100644 --- a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c +++ b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c @@ -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