Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Andreas Dilger <adilger@dilger.ca>
Message-Id: <18C6DFAB-B67B-45D0-9815-B3C1DF676495@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_0C98C711-8E76-492D-B580-3BAD5DAAB728";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [RFCv1 13/72] tst_badblocks: Add unit test to verify badblocks
 list merge api
Date:   Mon, 12 Dec 2022 13:35:42 -0700
In-Reply-To: <9442bf260312e78236353ce1976ea7edc519d1cf.1667822611.git.ritesh.list@gmail.com>
Cc:     Theodore Ts'o <tytso@mit.edu>, linux-ext4@vger.kernel.org,
        Harshad Shirwadkar <harshadshirwadkar@gmail.com>,
        Li Xi <lixi@ddn.com>, Wang Shilong <wangshilong1991@gmail.com>
To:     "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
References: <cover.1667822611.git.ritesh.list@gmail.com>
 <9442bf260312e78236353ce1976ea7edc519d1cf.1667822611.git.ritesh.list@gmail.com>
Precedence: bulk


--Apple-Mail=_0C98C711-8E76-492D-B580-3BAD5DAAB728
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

On Nov 7, 2022, at 5:21 AM, Ritesh Harjani (IBM) <ritesh.list@gmail.com> =
wrote:
>=20
> Add unit test to verify badblocks list merge api i.e.
> ext2fs_badblocks_merge()
>=20
> Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> ---
> lib/ext2fs/tst_badblocks.c | 61 ++++++++++++++++++++++++++++++++++++--
> 1 file changed, 59 insertions(+), 2 deletions(-)
>=20
> diff --git a/lib/ext2fs/tst_badblocks.c b/lib/ext2fs/tst_badblocks.c
> index b6e766ab..946de0ae 100644
> --- a/lib/ext2fs/tst_badblocks.c
> +++ b/lib/ext2fs/tst_badblocks.c
> @@ -119,6 +119,40 @@ static void print_list(badblocks_list bb, int =
verify)
> 	}
> }
>=20
> +static void do_list_merge_verify(badblocks_list bb, badblocks_list =
bbm, int verify)
> +{
> +	errcode_t retval;
> +	badblocks_iterate iter;
> +	blk_t blk;
> +	int i, ok;
> +
> +	retval =3D ext2fs_badblocks_merge(bb, bbm);
> +	if (retval) {
> +		com_err("do_list_merge_verify", retval, "while doing =
list merge");
> +		return;
> +	}
> +
> +	if (!verify)
> +		return;
> +
> +	retval =3D ext2fs_badblocks_list_iterate_begin(bb, &iter);
> +	if (retval) {
> +		com_err("do_list_merge_verify", retval, "while setting =
up iterator");
> +		return;
> +	}
> +
> +	while (ext2fs_badblocks_list_iterate(iter, &blk)) {
> +		retval =3D ext2fs_badblocks_list_test(bbm, blk);
> +		if (retval =3D=3D 0) {
> +			printf(" --- NOT OK\n");
> +			test_fail++;
> +			return;
> +		}
> +	}
> +	ext2fs_badblocks_list_iterate_end(iter);
> +	printf(" --- OK\n");
> +}
> +
> static void validate_test_seq(badblocks_list bb, blk_t *vec)
> {
> 	int	i, match, ok;
> @@ -275,13 +309,13 @@ out:
>=20
> int main(int argc, char **argv)
> {
> -	badblocks_list bb1, bb2, bb3, bb4, bb5;
> +	badblocks_list bb1, bb2, bb3, bb4, bb5, bbm;
> 	int	equal;
> 	errcode_t	retval;
>=20
> 	add_error_table(&et_ext2_error_table);
>=20
> -	bb1 =3D bb2 =3D bb3 =3D bb4 =3D bb5 =3D 0;
> +	bb1 =3D bb2 =3D bb3 =3D bb4 =3D bb5 =3D bbm =3D 0;
>=20
> 	printf("test1: ");
> 	retval =3D create_test_list(test1, &bb1);
> @@ -346,6 +380,27 @@ int main(int argc, char **argv)
> 		printf("\n");
> 	}
>=20
> +	printf("Create merge bb list\n");
> +	retval =3D ext2fs_badblocks_list_create(&bbm, 5);
> +	if (retval) {
> +		com_err("ext2fs_badblocks_list_create", retval, "while =
creating list");
> +		test_fail++;
> +	}
> +
> +	printf("Merge & Verify all bb{1..5} into bbm\n");
> +	if (bb1 && bb2 && bb3 && bb4 && bb5 && bbm) {
> +		printf("Merge bb1 into bbm");
> +		do_list_merge_verify(bb1, bbm, 1);
> +		printf("Merge bb2 into bbm");
> +		do_list_merge_verify(bb2, bbm, 1);
> +		printf("Merge bb3 into bbm");
> +		do_list_merge_verify(bb3, bbm, 1);
> +		printf("Merge bb4 into bbm");
> +		do_list_merge_verify(bb4, bbm, 1);
> +		printf("Merge bb5 into bbm");
> +		do_list_merge_verify(bb5, bbm, 1);
> +	}
> +
> 	file_test(bb4);
>=20
> 	file_test_invalid(bb4);
> @@ -363,6 +418,8 @@ int main(int argc, char **argv)
> 		ext2fs_badblocks_list_free(bb4);
> 	if (bb5)
> 		ext2fs_badblocks_list_free(bb5);
> +	if (bbm)
> +		ext2fs_badblocks_list_free(bbm);
>=20
> 	return test_fail;
>=20
> --
> 2.37.3
>=20


Cheers, Andreas


--Apple-Mail=_0C98C711-8E76-492D-B580-3BAD5DAAB728
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQIzBAEBCAAdFiEEDb73u6ZejP5ZMprvcqXauRfMH+AFAmOXkJ4ACgkQcqXauRfM
H+COrA/9GZ6SkzjYEoRfVimnEeE8xshdueGLlVewnM0VgeSh5Hzx4LctBuGZX5KC
BmZ9aZQhRwFSSw3n0t0013Vwb5O5Tg+Q2ZPnkkCZQbedPZjntVsvyqsfkEA4Cmhg
9LKlcJZ/atWlgSPpPEbhgY15YeciH/UKuma8zZOYYohdyWNUf3arV+cjlEBQW+VU
afBzWLgyhp1Uq6XUKbX/vuT54EnQ1FkAH0+sJakOWo7pV6KVIoHw2VxOLw/dy8gG
p8N/Jrvj0JAt8nqYE80Sh3tgenxAVmVdJ/c++/y3HG1EjUYy3p3T5Xyu+wexp5n6
7s2hZx/WTSBlQdIbJfudZZU9cNk4JdBx+3CfOA07klfIOorlGhQLjkQ2PLQXcfyq
K8CBlzakwUfzi9f7dkVpjFRQWZ1nsGeEPpy3Ea73BSkfR4p1t+c7iW6MP8kmAsYI
NVeh94Fx8TMuiFg+kK85NHZX7cdstd1yBdVOBR847vlXWRzYLBShjNCqTB4O15OO
AfQQqFwIYU70trM30YdfWU2igshxWeD+sQlCvm5vocrbsRRqeTPKYyUcvDdUTzi8
QWRgBeooYA9rBokf6IzPdCAPlN16QoK+kNh460LWLd6yWYIgOGGQhxky+48GtJPb
tOKe2bdxhQIZCqszBixCCUiQenWq3OrdNxNKoMshPPHxMo5H0L4=
=v9k7
-----END PGP SIGNATURE-----

--Apple-Mail=_0C98C711-8E76-492D-B580-3BAD5DAAB728--