Commit 49bff95f authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

test: Add test_sock.c, a mocked up socket library 



Instead of linking to the real sock library in the unit tests,
link to a mocked up version like we do with the env.

Change-Id: I9607f135c6af86e09fa52badf44897f90ce94521
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454492


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent bdb595cf

mk/spdk.unittest.mk

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/test 
CFLAGS += -ffunction-sections

LDFLAGS += -Wl,--gc-sections



SPDK_LIB_LIST += thread util log sock

SPDK_LIB_LIST += thread util log



LIBS += -lcunit $(SPDK_STATIC_LIB_LINKER_ARGS)

test/common/lib/test_sock.c

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*-

 *   BSD LICENSE

 *

 *   Copyright (c) Intel Corporation.

 *   All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions

 *   are met:

 *

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in

 *       the documentation and/or other materials provided with the

 *       distribution.

 *     * Neither the name of Intel Corporation nor the names of its

 *       contributors may be used to endorse or promote products derived

 *       from this software without specific prior written permission.

 *

 *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include "spdk/stdinc.h"



#include "spdk_internal/sock.h"

#include "spdk_internal/mock.h"



DEFINE_STUB(spdk_sock_getaddr, int, (struct spdk_sock *sock, char *saddr, int slen, uint16_t *sport,

				     char *caddr, int clen, uint16_t *cport), 0);

DEFINE_STUB(spdk_sock_connect, struct spdk_sock *, (const char *ip, int port), NULL);

DEFINE_STUB(spdk_sock_listen, struct spdk_sock *, (const char *ip, int port), NULL);

DEFINE_STUB(spdk_sock_accept, struct spdk_sock *, (struct spdk_sock *sock), NULL);

DEFINE_STUB(spdk_sock_close, int, (struct spdk_sock **sock), 0);

DEFINE_STUB(spdk_sock_recv, ssize_t, (struct spdk_sock *sock, void *buf, size_t len), 0);

DEFINE_STUB(spdk_sock_writev, ssize_t, (struct spdk_sock *sock, struct iovec *iov, int iovcnt), 0);

DEFINE_STUB(spdk_sock_readv, ssize_t, (struct spdk_sock *sock, struct iovec *iov, int iovcnt), 0);

DEFINE_STUB(spdk_sock_set_recvlowat, int, (struct spdk_sock *sock, int nbytes), 0);

DEFINE_STUB(spdk_sock_set_recvbuf, int, (struct spdk_sock *sock, int sz), 0);

DEFINE_STUB(spdk_sock_set_sendbuf, int, (struct spdk_sock *sock, int sz), 0);

DEFINE_STUB(spdk_sock_is_ipv6, bool, (struct spdk_sock *sock), false);

DEFINE_STUB(spdk_sock_is_ipv4, bool, (struct spdk_sock *sock), true);

DEFINE_STUB(spdk_sock_group_create, struct spdk_sock_group *, (void), NULL);

DEFINE_STUB(spdk_sock_group_add_sock, int, (struct spdk_sock_group *group, struct spdk_sock *sock,

		spdk_sock_cb cb_fn, void *cb_arg), 0);

DEFINE_STUB(spdk_sock_group_remove_sock, int, (struct spdk_sock_group *group,

		struct spdk_sock *sock), 0);

DEFINE_STUB(spdk_sock_group_poll, int, (struct spdk_sock_group *group), 0);

DEFINE_STUB(spdk_sock_group_poll_count, int, (struct spdk_sock_group *group, int max_events), 0);

DEFINE_STUB(spdk_sock_group_close, int, (struct spdk_sock_group **group), 0);

test/unit/lib/nvmf/tcp.c/tcp_ut.c

+6 −0
Original line number Diff line number Diff line
@@ -34,10 +34,13 @@ 
#include "spdk/stdinc.h"



#include "spdk_cunit.h"



#include "spdk_internal/mock.h"

#include "spdk_internal/thread.h"



#include "common/lib/test_env.c"

#include "common/lib/test_sock.c"



#include "nvmf/ctrlr.c"

#include "nvmf/tcp.c"
@@ -340,6 +343,7 @@ test_nvmf_tcp_poll_group_create(void) 
	struct spdk_nvmf_transport_poll_group *group;

	struct spdk_thread *thread;

	struct spdk_nvmf_transport_opts opts;

	struct spdk_sock_group grp = {};



	thread = spdk_thread_create(NULL, NULL);

	SPDK_CU_ASSERT_FATAL(thread != NULL);
@@ -356,7 +360,9 @@ test_nvmf_tcp_poll_group_create(void) 
	transport = spdk_nvmf_tcp_create(&opts);

	CU_ASSERT_PTR_NOT_NULL(transport);

	transport->opts = opts;

	MOCK_SET(spdk_sock_group_create, &grp);

	group = spdk_nvmf_tcp_poll_group_create(transport);

	MOCK_CLEAR_P(spdk_sock_group_create);

	SPDK_CU_ASSERT_FATAL(group);

	group->transport = transport;

	spdk_nvmf_tcp_poll_group_destroy(group);