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

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



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

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


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

test/unit/lib/bdev/bdev.c/Makefile

+2 −18
Original line number Diff line number Diff line
@@ -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

test/unit/lib/bdev/bdev.c/bdev_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

test/unit/lib/bdev/gpt/gpt.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 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

test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


#include "lib/test_env.c"



#include "gpt/gpt.c"

#include "bdev/gpt/gpt.c"



static void

test_check_mbr(void)

test/unit/lib/bdev/mt/bdev.c/Makefile

+2 −18
Original line number Diff line number Diff line
@@ -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