Commit dcf0ca15 authored by Vitaliy Mysak's avatar Vitaliy Mysak Committed by Tomasz Zawadzki
Browse files

ut: make use of CUnit macro to reduce duplications 

CUnit provides a helper macro CU_ADD_TEST() that
simplifies usage of CU_add_test() function.
Test name no longer needs to be provided,
as it will be inherited from function name.

This is a follow up to
https://review.spdk.io/gerrit/c/spdk/spdk/+/931



Change-Id: I8078f02e08b14f12328ae022d7090ba13fbd64e4
Signed-off-by: default avatarVitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1239


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 78b696bc

test/unit/lib/bdev/bdev.c/bdev_ut.c

+25 −26
Original line number Diff line number Diff line
@@ -3128,32 +3128,31 @@ main(int argc, char **argv) 


	suite = CU_add_suite("bdev", null_init, null_clean);



	CU_add_test(suite, "bytes_to_blocks_test", bytes_to_blocks_test);

	CU_add_test(suite, "num_blocks_test", num_blocks_test);

	CU_add_test(suite, "io_valid", io_valid_test);

	CU_add_test(suite, "open_write", open_write_test);

	CU_add_test(suite, "alias_add_del", alias_add_del_test);

	CU_add_test(suite, "get_device_stat", get_device_stat_test);

	CU_add_test(suite, "bdev_io_types", bdev_io_types_test);

	CU_add_test(suite, "bdev_io_wait", bdev_io_wait_test);

	CU_add_test(suite, "bdev_io_spans_boundary", bdev_io_spans_boundary_test);

	CU_add_test(suite, "bdev_io_split", bdev_io_split_test);

	CU_add_test(suite, "bdev_io_split_with_io_wait", bdev_io_split_with_io_wait);

	CU_add_test(suite, "bdev_io_alignment_with_boundary", bdev_io_alignment_with_boundary);

	CU_add_test(suite, "bdev_io_alignment", bdev_io_alignment);

	CU_add_test(suite, "bdev_histograms", bdev_histograms);

	CU_add_test(suite, "bdev_write_zeroes", bdev_write_zeroes);

	CU_add_test(suite, "bdev_compare_and_write", bdev_compare_and_write);

	CU_add_test(suite, "bdev_compare", bdev_compare);

	CU_add_test(suite, "bdev_open_while_hotremove", bdev_open_while_hotremove);

	CU_add_test(suite, "bdev_close_while_hotremove", bdev_close_while_hotremove);

	CU_add_test(suite, "bdev_open_ext", bdev_open_ext);

	CU_add_test(suite, "bdev_set_io_timeout", bdev_set_io_timeout);

	CU_add_test(suite, "lba_range_overlap", lba_range_overlap);

	CU_add_test(suite, "lock_lba_range_check_ranges", lock_lba_range_check_ranges);

	CU_add_test(suite, "lock_lba_range_with_io_outstanding",

		    lock_lba_range_with_io_outstanding);

	CU_add_test(suite, "lock_lba_range_overlapped", lock_lba_range_overlapped);

	CU_ADD_TEST(suite, bytes_to_blocks_test);

	CU_ADD_TEST(suite, num_blocks_test);

	CU_ADD_TEST(suite, io_valid_test);

	CU_ADD_TEST(suite, open_write_test);

	CU_ADD_TEST(suite, alias_add_del_test);

	CU_ADD_TEST(suite, get_device_stat_test);

	CU_ADD_TEST(suite, bdev_io_types_test);

	CU_ADD_TEST(suite, bdev_io_wait_test);

	CU_ADD_TEST(suite, bdev_io_spans_boundary_test);

	CU_ADD_TEST(suite, bdev_io_split_test);

	CU_ADD_TEST(suite, bdev_io_split_with_io_wait);

	CU_ADD_TEST(suite, bdev_io_alignment_with_boundary);

	CU_ADD_TEST(suite, bdev_io_alignment);

	CU_ADD_TEST(suite, bdev_histograms);

	CU_ADD_TEST(suite, bdev_write_zeroes);

	CU_ADD_TEST(suite, bdev_compare_and_write);

	CU_ADD_TEST(suite, bdev_compare);

	CU_ADD_TEST(suite, bdev_open_while_hotremove);

	CU_ADD_TEST(suite, bdev_close_while_hotremove);

	CU_ADD_TEST(suite, bdev_open_ext);

	CU_ADD_TEST(suite, bdev_set_io_timeout);

	CU_ADD_TEST(suite, lba_range_overlap);

	CU_ADD_TEST(suite, lock_lba_range_check_ranges);

	CU_ADD_TEST(suite, lock_lba_range_with_io_outstanding);

	CU_ADD_TEST(suite, lock_lba_range_overlapped);



	allocate_threads(1);

	set_thread(0);

test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c

+5 −5
Original line number Diff line number Diff line
@@ -1167,11 +1167,11 @@ main(int argc, const char **argv) 


	suite = CU_add_suite("ocssd", NULL, NULL);



	CU_add_test(suite, "test_create_controller", test_create_controller);

	CU_add_test(suite, "test_device_geometry", test_device_geometry);

	CU_add_test(suite, "test_lba_translation", test_lba_translation);

	CU_add_test(suite, "test_parallel_unit_range", test_parallel_unit_range);

	CU_add_test(suite, "test_get_zone_info", test_get_zone_info);

	CU_ADD_TEST(suite, test_create_controller);

	CU_ADD_TEST(suite, test_device_geometry);

	CU_ADD_TEST(suite, test_lba_translation);

	CU_ADD_TEST(suite, test_parallel_unit_range);

	CU_ADD_TEST(suite, test_get_zone_info);



	g_thread = spdk_thread_create("test", NULL);

	spdk_set_thread(g_thread);

test/unit/lib/bdev/bdev_zone.c/bdev_zone_ut.c

+6 −6
Original line number Diff line number Diff line
@@ -414,12 +414,12 @@ main(int argc, char **argv) 
	CU_initialize_registry();



	suite = CU_add_suite("zone", test_setup, test_cleanup);

	CU_add_test(suite, "test_zone_get_operation", test_zone_get_operation);

	CU_add_test(suite, "test_bdev_zone_get_info", test_bdev_zone_get_info);

	CU_add_test(suite, "test_bdev_zone_management", test_bdev_zone_management);

	CU_add_test(suite, "test_bdev_zone_append", test_bdev_zone_append);

	CU_add_test(suite, "test_bdev_zone_append_with_md", test_bdev_zone_append_with_md);

	CU_add_test(suite, "test_bdev_io_get_append_location", test_bdev_io_get_append_location);

	CU_ADD_TEST(suite, test_zone_get_operation);

	CU_ADD_TEST(suite, test_bdev_zone_get_info);

	CU_ADD_TEST(suite, test_bdev_zone_management);

	CU_ADD_TEST(suite, test_bdev_zone_append);

	CU_ADD_TEST(suite, test_bdev_zone_append_with_md);

	CU_ADD_TEST(suite, test_bdev_io_get_append_location);



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

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

+8 −16
Original line number Diff line number Diff line
@@ -1105,22 +1105,14 @@ main(int argc, char **argv) 
	CU_initialize_registry();



	suite = CU_add_suite("compress", test_setup, test_cleanup);

	CU_add_test(suite, "test_compress_operation",

		    test_compress_operation);

	CU_add_test(suite, "test_compress_operation_cross_boundary",

		    test_compress_operation_cross_boundary);

	CU_add_test(suite, "vbdev_compress_submit_request",

		    test_vbdev_compress_submit_request);

	CU_add_test(suite, "test_passthru",

		    test_passthru);

	CU_add_test(suite, "test_initdrivers",

		    test_initdrivers);

	CU_add_test(suite, "test_supported_io",

		    test_supported_io);

	CU_add_test(suite, "test_poller",

		    test_poller);

	CU_add_test(suite, "test_reset",

		    test_reset);

	CU_ADD_TEST(suite, test_compress_operation);

	CU_ADD_TEST(suite, test_compress_operation_cross_boundary);

	CU_ADD_TEST(suite, test_vbdev_compress_submit_request);

	CU_ADD_TEST(suite, test_passthru);

	CU_ADD_TEST(suite, test_initdrivers);

	CU_ADD_TEST(suite, test_supported_io);

	CU_ADD_TEST(suite, test_poller);

	CU_ADD_TEST(suite, test_reset);



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();

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

+13 −26
Original line number Diff line number Diff line
@@ -1062,32 +1062,19 @@ main(int argc, char **argv) 
	CU_initialize_registry();



	suite = CU_add_suite("crypto", test_setup, test_cleanup);

	CU_add_test(suite, "test_error_paths",

		    test_error_paths);

	CU_add_test(suite, "test_simple_write",

		    test_simple_write);

	CU_add_test(suite, "test_simple_read",

		    test_simple_read);

	CU_add_test(suite, "test_large_rw",

		    test_large_rw);

	CU_add_test(suite, "test_dev_full",

		    test_dev_full);

	CU_add_test(suite, "test_crazy_rw",

		    test_crazy_rw);

	CU_add_test(suite, "test_passthru",

		    test_passthru);

	CU_add_test(suite, "test_initdrivers",

		    test_initdrivers);

	CU_add_test(suite, "test_crypto_op_complete",

		    test_crypto_op_complete);

	CU_add_test(suite, "test_supported_io",

		    test_supported_io);

	CU_add_test(suite, "test_reset",

		    test_reset);

	CU_add_test(suite, "test_poller",

		    test_poller);

	CU_add_test(suite, "test_assign_device_qp",

		    test_assign_device_qp);

	CU_ADD_TEST(suite, test_error_paths);

	CU_ADD_TEST(suite, test_simple_write);

	CU_ADD_TEST(suite, test_simple_read);

	CU_ADD_TEST(suite, test_large_rw);

	CU_ADD_TEST(suite, test_dev_full);

	CU_ADD_TEST(suite, test_crazy_rw);

	CU_ADD_TEST(suite, test_passthru);

	CU_ADD_TEST(suite, test_initdrivers);

	CU_ADD_TEST(suite, test_crypto_op_complete);

	CU_ADD_TEST(suite, test_supported_io);

	CU_ADD_TEST(suite, test_reset);

	CU_ADD_TEST(suite, test_poller);

	CU_ADD_TEST(suite, test_assign_device_qp);



	CU_basic_set_mode(CU_BRM_VERBOSE);

	CU_basic_run_tests();