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

ut_mock: rename library from spdk_mock to ut_mock 



This matches the lib/ut_mock directory name, and also
avoids the final library being named spdk_spdk_mock.a.

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

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 7962ce31

lib/ut_mock/Makefile

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



C_SRCS = mock.c

LIBNAME = spdk_mock

LIBNAME = ut_mock



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

mk/spdk.app.mk

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ SPDK_LIB_LINKER_ARGS = \ 
SPDK_STATIC_LIB_LINKER_ARGS = \

	$(SPDK_LIB_LIST:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.a) \

	-Wl,--whole-archive \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_spdk_mock.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_ut_mock.a \

	-Wl,--no-whole-archive



install: all

shared_lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk 
SHARED_LINKED_LIB := $(SPDK_ROOT_DIR)/build/lib/libspdk.so

SHARED_REALNAME_LIB := $(SHARED_LINKED_LIB).$(SO_SUFFIX_ALL)

IGNORED_LIBS := libspdk.so

IGNORED_LIBS += libspdk_spdk_mock.so

IGNORED_LIBS += libspdk_ut_mock.so

IGNORED_LIBS += libspdk_env_dpdk.so



SPDK_SHARED_LIBS := $(filter-out $(IGNORED_LIBS), $(sort $(notdir $(wildcard $(SPDK_ROOT_DIR)/build/lib/*.so))))