Commit 8d7e3283 authored by Jim Harris's avatar Jim Harris
Browse files

test: use spdk.unittest.mk for vhost unit tests 



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

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


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

test/unit/lib/vhost/vhost.c/Makefile

+2 −18
Original line number Diff line number Diff line
@@ -35,24 +35,8 @@ 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 util



CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost/rte_vhost

CFLAGS += $(ENV_CFLAGS)

LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += -lcunit



APP = vhost_ut

C_SRCS = vhost_ut.c



all: $(APP)



$(APP): $(OBJS) $(SPDK_LIB_FILES)

	$(LINK_C)



clean:

	$(CLEAN_C) $(APP)

TEST_FILE = vhost_ut.c



include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk

test/unit/lib/vhost/vhost.c/vhost_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "spdk_internal/mock.h"

#include "lib/test_env.c"



#include "vhost.c"

#include "vhost/vhost.c"



DEFINE_STUB(rte_vhost_driver_unregister, int, (const char *path), 0);

DEFINE_STUB(spdk_event_allocate, struct spdk_event *,

test/unit/lib/vhost/vhost_blk.c/Makefile

+2 −18
Original line number Diff line number Diff line
@@ -35,24 +35,8 @@ 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 util



CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost/rte_vhost

CFLAGS += $(ENV_CFLAGS)

LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += -lcunit



APP = vhost_blk_ut

C_SRCS = vhost_blk_ut.c



all: $(APP)



$(APP): $(OBJS) $(SPDK_LIB_FILES)

	$(LINK_C)



clean:

	$(CLEAN_C) $(APP)

TEST_FILE = vhost_blk_ut.c



include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk

test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include "spdk_internal/mock.h"

#include "lib/test_env.c"



#include "vhost_blk.c"

#include "vhost/vhost_blk.c"

#include "unit/lib/vhost/test_vhost.c"



#include "spdk_internal/bdev.h"

test/unit/lib/vhost/vhost_scsi.c/Makefile

+2 −18
Original line number Diff line number Diff line
@@ -35,24 +35,8 @@ 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 util



CFLAGS += -I$(SPDK_ROOT_DIR)/test

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost

CFLAGS += -I$(SPDK_ROOT_DIR)/lib/vhost/rte_vhost

CFLAGS += $(ENV_CFLAGS)

LIBS += $(SPDK_LIB_LINKER_ARGS)

LIBS += -lcunit



APP = vhost_scsi_ut

C_SRCS = vhost_scsi_ut.c



all: $(APP)



$(APP): $(OBJS) $(SPDK_LIB_FILES)

	$(LINK_C)



clean:

	$(CLEAN_C) $(APP)

TEST_FILE = vhost_scsi_ut.c



include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk
 
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk