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

test: use spdk.unittest.mk in blob and blobfs unit tests 



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

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


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

test/unit/lib/blob/blob.c/Makefile

+2 −17
Original line number Diff line number Diff line
@@ -36,21 +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



APP = blob_ut

TEST_FILE = blob_ut.c



C_SRCS := blob_ut.c

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/blob -I$(SPDK_ROOT_DIR)/test



SPDK_LIB_LIST = util log spdk_mock



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

test/unit/lib/blob/blob.c/blob_ut.c

+3 −3
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ 


#include "lib/test_env.c"

#include "../bs_dev_common.c"

#include "blobstore.c"

#include "request.c"

#include "zeroes.c"

#include "blob/blobstore.c"

#include "blob/request.c"

#include "blob/zeroes.c"



struct spdk_blob_store *g_bs;

spdk_blob_id g_blobid;

test/unit/lib/blobfs/tree.c/Makefile

+2 −15
Original line number Diff line number Diff line
@@ -35,19 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

include $(SPDK_ROOT_DIR)/mk/spdk.app.mk



APP = tree_ut

TEST_FILE = tree_ut.c



C_SRCS := tree_ut.c

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/blobfs -I$(SPDK_ROOT_DIR)/test



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

test/unit/lib/blobfs/tree.c/tree_ut.c

+1 −2
Original line number Diff line number Diff line
@@ -32,9 +32,8 @@ 
 */



#include "spdk_cunit.h"

#include "tree.h"



#include "tree.c"

#include "blobfs/tree.c"



void

spdk_cache_buffer_free(struct cache_buffer *cache_buffer)