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

make: Fix test app Makefile dependencies

Browse Source 
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: Vitaliy 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: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Vitaliy Mysak 2018-09-16 01:07:44 +00:00 committed by Jim Harris
parent 87eacb6829
commit 4a7240a7f5
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/spdk.unittest.mk
View File

@ -49,7 +49,7 @@ APP = $(TEST_FILE:.c=)
all: $(APP) all: $(APP)
@: @:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ADDITIONAL_LIBS)
$(LINK_C) $(LINK_C)
clean: clean:

1
test/env/memory/Makefile vendored
View File

@ -39,4 +39,5 @@ CFLAGS += $(ENV_CFLAGS)
CFLAGS += -I$(SPDK_ROOT_DIR)/test/lib CFLAGS += -I$(SPDK_ROOT_DIR)/test/lib
TEST_FILE = memory_ut.c TEST_FILE = memory_ut.c
ADDITIONAL_LIBS += $(ENV_LIBS)
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk

1
test/env/pci/Makefile vendored
View File

@ -39,4 +39,5 @@ CFLAGS += $(ENV_CFLAGS)
LIBS += $(ENV_LINKER_ARGS) LIBS += $(ENV_LINKER_ARGS)
TEST_FILE = pci_ut.c TEST_FILE = pci_ut.c
ADDITIONAL_LIBS += $(ENV_LIBS)
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk

1
test/env/vtophys/Makefile vendored
View File

@ -38,4 +38,5 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
LIBS += $(ENV_LINKER_ARGS) LIBS += $(ENV_LINKER_ARGS)
TEST_FILE = vtophys.c TEST_FILE = vtophys.c
ADDITIONAL_LIBS += $(ENV_LIBS)
include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk include $(SPDK_ROOT_DIR)/mk/spdk.unittest.mk