Commit 93984d25 authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Changpeng Liu
Browse files

mock: remove trailing semicolon from MOCK_ definitions 



Require callers to add trailing semicolon by
themselves.

Change-Id: I0afcfde1b5c0a00102755a43c5723c0cd3324565
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/448211


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 2fd1b7a7

include/spdk_internal/mock.h

+3 −3
Original line number Diff line number Diff line
@@ -56,11 +56,11 @@ 
	ut_ ## fn



#define MOCK_CLEAR(fn) \

	ut_ ## fn ## _mocked = false;

	ut_ ## fn ## _mocked = false



#define MOCK_CLEAR_P(fn) \

	ut_ ## fn ## _mocked = false; \

	ut_ ## fn = NULL;

	ut_ ## fn = NULL



/* for proving to *certain* static analysis tools that we didn't reset the mock function. */

#define MOCK_CLEARED_ASSERT(fn) \
@@ -70,7 +70,7 @@ 
#define DECLARE_WRAPPER(fn, ret, args) \

	extern bool ut_ ## fn ## _mocked; \

	extern ret ut_ ## fn; \

	ret __wrap_ ## fn args; ret __real_ ## fn args;

	ret __wrap_ ## fn args; ret __real_ ## fn args



/* for defining the implmentation of wrappers for syscalls */

#define DEFINE_WRAPPER(fn, ret, dargs, pargs) \

test/unit/lib/nvme/nvme.c/nvme_ut.c

+2 −2
Original line number Diff line number Diff line
@@ -678,8 +678,8 @@ test_nvme_allocate_request_user_copy(void) 
	/* put a dummy on the queue */

	STAILQ_INSERT_HEAD(&qpair.free_req, &dummy_req, stailq);



	MOCK_CLEAR(spdk_malloc)

	MOCK_CLEAR(spdk_zmalloc)

	MOCK_CLEAR(spdk_malloc);

	MOCK_CLEAR(spdk_zmalloc);

	req = nvme_allocate_request_user_copy(&qpair, buffer, payload_size, cb_fn,

					      cb_arg, host_to_controller);

	SPDK_CU_ASSERT_FATAL(req != NULL);

test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c

+4 −4
Original line number Diff line number Diff line
@@ -1691,10 +1691,10 @@ test_spdk_nvme_ctrlr_doorbell_buffer_config(void) 
	ctrlr.cdata.oacs.doorbell_buffer_config = 1;

	ctrlr.trid.trtype = SPDK_NVME_TRANSPORT_PCIE;

	ctrlr.page_size = 0x1000;

	MOCK_CLEAR(spdk_malloc)

	MOCK_CLEAR(spdk_zmalloc)

	MOCK_CLEAR(spdk_dma_malloc)

	MOCK_CLEAR(spdk_dma_zmalloc)

	MOCK_CLEAR(spdk_malloc);

	MOCK_CLEAR(spdk_zmalloc);

	MOCK_CLEAR(spdk_dma_malloc);

	MOCK_CLEAR(spdk_dma_zmalloc);

	ret = nvme_ctrlr_set_doorbell_buffer_config(&ctrlr);

	CU_ASSERT(ret == 0);

	nvme_ctrlr_free_doorbell_buffer(&ctrlr);