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

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

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

Reviewed-on: https://review.gerrithub.io/399729
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:39:43 -07:00
parent d8c3ff5fd6
commit aae47b50fb
4 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/unit/lib/blob/blob.c/Makefile
View File

@ -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.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk
APP = blob_ut TEST_FILE = blob_ut.c
C_SRCS := blob_ut.c include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
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

6
test/unit/lib/blob/blob.c/blob_ut.c
View File

@ -38,9 +38,9 @@
#include "lib/test_env.c" #include "lib/test_env.c"
#include "../bs_dev_common.c" #include "../bs_dev_common.c"
#include "blobstore.c" #include "blob/blobstore.c"
#include "request.c" #include "blob/request.c"
#include "zeroes.c" #include "blob/zeroes.c"
struct spdk_blob_store *g_bs; struct spdk_blob_store *g_bs;
spdk_blob_id g_blobid; spdk_blob_id g_blobid;

17
test/unit/lib/blobfs/tree.c/Makefile
View File

@ -35,19 +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
APP = tree_ut TEST_FILE = tree_ut.c
C_SRCS := tree_ut.c include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk
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

3
test/unit/lib/blobfs/tree.c/tree_ut.c
View File

@ -32,9 +32,8 @@
*/ */
#include "spdk_cunit.h" #include "spdk_cunit.h"
#include "tree.h"
#include "tree.c" #include "blobfs/tree.c"
void void
spdk_cache_buffer_free(struct cache_buffer *cache_buffer) spdk_cache_buffer_free(struct cache_buffer *cache_buffer)