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

mk: add mocking for mingw cross builds

Browse Source 
On Windows there has to be a thin layer above the system calls to
provide POSIX functionality. When wrapping system calls, the name needs
to be prefixed with wpdk_ to ensure that the layer is called.

Re-arrange the definitions to facilitate wrapping and prefix with wpdk_
for mingw. For other compilers targeting Windows, the --wrap flag is not
supported and the layer above the system calls implements an alternative
mechanism to enable the mocking.

Tested with $(info LDFLAGS) added to spdk.mock.unittest.mk combined with
visual inspection and running the unit tests.

Signed-off-by: Nick Connolly <nick.connolly@mayadata.io>
Change-Id: If00504740229362c40bee4ae171d35489afb2e77
Signed-off-by: Nick Connolly <nick.connolly@mayadata.io>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6577
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Nick Connolly 2021-02-26 15:17:45 +00:00 committed by Tomasz Zawadzki
parent 3399171388
commit 2a8065b554
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mk/spdk.mock.unittest.mk
View File

@ -30,10 +30,26 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# #
LDFLAGS += \ SPDK_MOCK_SYSCALLS = \
-Wl,--wrap,calloc \ calloc \
-Wl,--wrap,pthread_mutexattr_init \ pthread_mutexattr_init \
-Wl,--wrap,pthread_mutex_init \ pthread_mutex_init \
-Wl,--wrap,recvmsg \ recvmsg \
-Wl,--wrap,sendmsg \ sendmsg \
-Wl,--wrap,writev writev
define add_wrap_with_prefix
$(2:%=-Wl,--wrap,$(1)%)
endef
ifeq ($(OS),Windows)
# Windows needs a thin layer above the system calls to provide POSIX
# functionality. For GCC, use the prefix wpdk_ to ensure that the layer
# is called. For other compilers, --wrap is not supported so the layer
# implements an alternative mechanism to enable mocking.
ifeq ($(CC_TYPE),gcc)
LDFLAGS += $(call add_wrap_with_prefix,wpdk_,$(SPDK_MOCK_SYSCALLS))
endif
else
LDFLAGS += $(call add_wrap_with_prefix,,$(SPDK_MOCK_SYSCALLS))
endif