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

test: use spdk.unittest.mk for event and log unit tests 



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

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


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

test/unit/lib/event/subsystem.c/Makefile

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

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



CFLAGS += -I$(SPDK_ROOT_DIR)/test

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

APP = subsystem_ut

C_SRCS := subsystem_ut.c

TEST_FILE = subsystem_ut.c



SPDK_LIB_LIST = log



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/event/subsystem.c/subsystem_ut.c

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


#include "spdk_cunit.h"



#include "subsystem.c"

#include "event/subsystem.c"



static struct spdk_subsystem g_ut_subsystems[8];

static struct spdk_subsystem_depend g_ut_subsystem_deps[8];

test/unit/lib/log/log.c/Makefile

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

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



APP = log_ut

TEST_FILE = log_ut.c



C_SRCS := log_ut.c

CFLAGS += -I$(SPDK_ROOT_DIR)/test

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



LIBS += $(SPDK_LIBS) -lcunit



all : $(APP)



$(APP) : $(OBJS) $(SPDK_LIBS)

	$(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/log/log.c/log_ut.c

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
#include "spdk_cunit.h"

#include "spdk/log.h"



#include "log.c"

#include "log_flags.c"

#include "log/log.c"

#include "log/log_flags.c"



static void

log_test(void)