Commit 99537401 authored by Artur Paszkiewicz's avatar Artur Paszkiewicz Committed by Tomasz Zawadzki
Browse files

ut/raid: refactor setting test params 



Signed-off-by: default avatarArtur Paszkiewicz <artur.paszkiewicz@intel.com>
Change-Id: Ib06297159ebcb354da5198b9b0c4eeef087cde1c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21681


Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Community-CI: Mellanox Build Bot
parent 5425ac4b

test/unit/lib/bdev/raid/concat.c/concat_ut.c

+7 −7
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ test_setup(void) 
	uint64_t *base_bdev_blockcnt;

	uint32_t *base_bdev_blocklen;

	uint32_t *strip_size_kb;

	struct raid_params params;

	uint64_t params_count;

	int rc;
@@ -196,13 +195,14 @@ test_setup(void) 
		ARRAY_FOR_EACH(base_bdev_blockcnt_values, base_bdev_blockcnt) {

			ARRAY_FOR_EACH(base_bdev_blocklen_values, base_bdev_blocklen) {

				ARRAY_FOR_EACH(strip_size_kb_values, strip_size_kb) {

					params.num_base_bdevs = *num_base_bdevs;

					params.base_bdev_blockcnt = *base_bdev_blockcnt;

					params.base_bdev_blocklen = *base_bdev_blocklen;

					params.strip_size = *strip_size_kb * 1024 / *base_bdev_blocklen;

					params.md_len = 0;

					struct raid_params params = {

						.num_base_bdevs = *num_base_bdevs,

						.base_bdev_blockcnt = *base_bdev_blockcnt,

						.base_bdev_blocklen = *base_bdev_blocklen,

						.strip_size = *strip_size_kb * 1024 / *base_bdev_blocklen,

					};

					if (params.strip_size == 0 ||

					    params.strip_size > *base_bdev_blockcnt) {

					    params.strip_size > params.base_bdev_blockcnt) {

						continue;

					}

					raid_test_params_add(&params);

test/unit/lib/bdev/raid/raid1.c/raid1_ut.c

+5 −6
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ test_setup(void) 
	uint8_t *num_base_bdevs;

	uint64_t *base_bdev_blockcnt;

	uint32_t *base_bdev_blocklen;

	struct raid_params params;

	uint64_t params_count;

	int rc;
@@ -67,11 +66,11 @@ test_setup(void) 
	ARRAY_FOR_EACH(num_base_bdevs_values, num_base_bdevs) {

		ARRAY_FOR_EACH(base_bdev_blockcnt_values, base_bdev_blockcnt) {

			ARRAY_FOR_EACH(base_bdev_blocklen_values, base_bdev_blocklen) {

				params.num_base_bdevs = *num_base_bdevs;

				params.base_bdev_blockcnt = *base_bdev_blockcnt;

				params.base_bdev_blocklen = *base_bdev_blocklen;

				params.strip_size = 0;

				params.md_len = 0;

				struct raid_params params = {

					.num_base_bdevs = *num_base_bdevs,

					.base_bdev_blockcnt = *base_bdev_blockcnt,

					.base_bdev_blocklen = *base_bdev_blocklen,

				};

				raid_test_params_add(&params);

			}

		}

test/unit/lib/bdev/raid/raid5f.c/raid5f_ut.c

+8 −7
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ test_suite_init(void) 
	uint32_t *base_bdev_blocklen;

	uint32_t *strip_size_kb;

	uint32_t *md_len;

	struct raid_params params;

	uint64_t params_count;

	int rc;
@@ -118,13 +117,15 @@ test_suite_init(void) 
			ARRAY_FOR_EACH(base_bdev_blocklen_values, base_bdev_blocklen) {

				ARRAY_FOR_EACH(strip_size_kb_values, strip_size_kb) {

					ARRAY_FOR_EACH(md_len_values, md_len) {

						params.num_base_bdevs = *num_base_bdevs;

						params.base_bdev_blockcnt = *base_bdev_blockcnt;

						params.base_bdev_blocklen = *base_bdev_blocklen;

						params.strip_size = *strip_size_kb * 1024 / *base_bdev_blocklen;

						params.md_len = *md_len;

						struct raid_params params = {

							.num_base_bdevs = *num_base_bdevs,

							.base_bdev_blockcnt = *base_bdev_blockcnt,

							.base_bdev_blocklen = *base_bdev_blocklen,

							.strip_size = *strip_size_kb * 1024 / *base_bdev_blocklen,

							.md_len = *md_len,

						};

						if (params.strip_size == 0 ||

						    params.strip_size > *base_bdev_blockcnt) {

						    params.strip_size > params.base_bdev_blockcnt) {

							continue;

						}

						raid_test_params_add(&params);