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

ut: move all spdk_env_* mocks to test_env.c 



Cleanup.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 266ca940

test/common/lib/test_env.c

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,11 @@ DEFINE_STUB(spdk_memzone_lookup, void *, (const char *name), NULL) 
DEFINE_STUB(spdk_pci_nvme_get_driver, struct spdk_pci_driver *, (void), NULL)

DEFINE_STUB(spdk_pci_ioat_get_driver, struct spdk_pci_driver *, (void), NULL)

DEFINE_STUB(spdk_pci_virtio_get_driver, struct spdk_pci_driver *, (void), NULL)

DEFINE_STUB(spdk_env_get_first_core, uint32_t, (void), 0);

DEFINE_STUB(spdk_env_get_next_core, uint32_t, (uint32_t prev_core), 0);

DEFINE_STUB(spdk_env_get_last_core, uint32_t, (void), 0);

DEFINE_STUB(spdk_env_get_current_core, uint32_t, (void), 0);

DEFINE_STUB(spdk_env_get_socket_id, uint32_t, (uint32_t core), 0);



/*

 * These mocks don't use the DEFINE_STUB macros because

test/unit/lib/bdev/compress.c/compress_ut.c

+0 −2
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ DEFINE_STUB(spdk_bdev_io_type_supported, bool, (struct spdk_bdev *bdev, 
DEFINE_STUB_V(spdk_bdev_module_release_bdev, (struct spdk_bdev *bdev));

DEFINE_STUB_V(spdk_bdev_close, (struct spdk_bdev_desc *desc));

DEFINE_STUB(spdk_bdev_get_name, const char *, (const struct spdk_bdev *bdev), 0);

DEFINE_STUB(spdk_env_get_current_core, uint32_t, (void), 0);

DEFINE_STUB(spdk_bdev_get_io_channel, struct spdk_io_channel *, (struct spdk_bdev_desc *desc), 0);

DEFINE_STUB_V(spdk_bdev_unregister, (struct spdk_bdev *bdev, spdk_bdev_unregister_cb cb_fn,

				     void *cb_arg));
@@ -251,7 +250,6 @@ DEFINE_STUB(spdk_bdev_module_claim_bdev, int, (struct spdk_bdev *bdev, struct sp 
DEFINE_STUB_V(spdk_bdev_module_examine_done, (struct spdk_bdev_module *module));

DEFINE_STUB(spdk_bdev_register, int, (struct spdk_bdev *bdev), 0);

DEFINE_STUB(spdk_bdev_get_by_name, struct spdk_bdev *, (const char *bdev_name), NULL);

DEFINE_STUB(spdk_env_get_socket_id, uint32_t, (uint32_t core), 0);

DEFINE_STUB(spdk_bdev_io_get_io_channel, struct spdk_io_channel *, (struct spdk_bdev_io *bdev_io),

	    0);

DEFINE_STUB(spdk_bdev_queue_io_wait, int, (struct spdk_bdev *bdev, struct spdk_io_channel *ch,

test/unit/lib/bdev/crypto.c/crypto_ut.c

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ DEFINE_STUB(spdk_bdev_module_claim_bdev, int, (struct spdk_bdev *bdev, struct sp 
		struct spdk_bdev_module *module), 0);

DEFINE_STUB_V(spdk_bdev_module_examine_done, (struct spdk_bdev_module *module));

DEFINE_STUB(spdk_bdev_register, int, (struct spdk_bdev *vbdev), 0);

DEFINE_STUB(spdk_env_get_socket_id, uint32_t, (uint32_t core), 0);



/* DPDK stubs */

DEFINE_STUB(rte_cryptodev_count, uint8_t, (void), 0);

test/unit/lib/event/app.c/app_ut.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
DEFINE_STUB_V(spdk_event_call, (struct spdk_event *event));

DEFINE_STUB(spdk_event_allocate, struct spdk_event *, (uint32_t core, spdk_event_fn fn, void *arg1,

		void *arg2), NULL);

DEFINE_STUB(spdk_env_get_current_core, uint32_t, (void), 0);

DEFINE_STUB_V(spdk_subsystem_init, (spdk_msg_fn cb_fn, void *cb_arg));

DEFINE_STUB_V(spdk_rpc_register_method, (const char *method, spdk_rpc_method_handler func,

		uint32_t state_mask));

test/unit/lib/event/subsystem.c/subsystem_ut.c

+0 −6
Original line number Diff line number Diff line
@@ -49,12 +49,6 @@ spdk_app_stop(int rc) 
	global_rc = rc;

}



uint32_t

spdk_env_get_current_core(void)

{

	return 0;

}



static void

ut_event_fn(void *arg1)

{