Commit 4a7240a7 authored by Vitaliy Mysak's avatar Vitaliy Mysak Committed by Jim Harris
Browse files

make: Fix test app Makefile dependencies 



Add dependency $(ENV_LIBS) for test/env/*
 as part of new variable $(ADDITIONAL_LIBS) which is direct dependency
 of $(APP) in mk/spdk.unittest.mk

This solves the problem of
 make not triggering LINKing for test/env/*
 after changes made to lib/env_dpdk/*.c

Issue was that Makefiles in test/env/*/ classified tests as unittests
 by including mk/spdk.unittest.mk
But unittests are not using env_dpdk which means that
 unittests don't relink on env_dpdk update

Change-Id: I91b6690dc92d68bc69bbf11ac5336d3a7f56e4e4
Signed-off-by: default avatarVitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-on: https://review.gerrithub.io/425665


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 87eacb68

mk/spdk.unittest.mk

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ APP = $(TEST_FILE:.c=) 
all: $(APP)

	@:



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

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

	$(LINK_C)



clean:

test/env/memory/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,4 +39,5 @@ CFLAGS += $(ENV_CFLAGS) 
CFLAGS += -I$(SPDK_ROOT_DIR)/test/lib

TEST_FILE = memory_ut.c



ADDITIONAL_LIBS += $(ENV_LIBS)

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

test/env/pci/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,4 +39,5 @@ CFLAGS += $(ENV_CFLAGS) 
LIBS += $(ENV_LINKER_ARGS)

TEST_FILE = pci_ut.c



ADDITIONAL_LIBS += $(ENV_LIBS)

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

test/env/vtophys/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -38,4 +38,5 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk 
LIBS += $(ENV_LINKER_ARGS)

TEST_FILE = vtophys.c



ADDITIONAL_LIBS += $(ENV_LIBS)

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