2022-12-26 13:23:27

by José Expósito

Subject: [PATCH] HID: uclogic: Use KUNIT_EXPECT_MEMEQ

Commit b8a926bea8b1 ("kunit: Introduce KUNIT_EXPECT_MEMEQ and
KUNIT_EXPECT_MEMNEQ macros") introduced a new macro to compare blocks of
memory and, if the test fails, print the result in a human friendly
format. For example, this is the output of a test failure:

Expected res == params->expected, but
res ==
01 02 aa 00 00 00 03 bb 00 <00> 00 04 05
params->expected ==
01 02 aa 00 00 00 03 bb 00 <01> 00 04 05

Use this new macro to replace KUNIT_EXPECT_EQ + memcmp.

Signed-off-by: José Expósito <[email protected]>
---
drivers/hid/hid-uclogic-rdesc-test.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/hid/hid-uclogic-rdesc-test.c b/drivers/hid/hid-uclogic-rdesc-test.c
index b429c541bf2f..90bf4e586e01 100644
--- a/drivers/hid/hid-uclogic-rdesc-test.c
+++ b/drivers/hid/hid-uclogic-rdesc-test.c
@@ -197,8 +197,7 @@ static void hid_test_uclogic_template(struct kunit *test)
params->param_list,
params->param_num);
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, res);
- KUNIT_EXPECT_EQ(test, 0,
- memcmp(res, params->expected, params->template_size));
+ KUNIT_EXPECT_MEMEQ(test, res, params->expected, params->template_size);
kfree(res);
}

--
2.38.1

2022-12-26 13:39:25

by Maira Canal

Subject: Re: [PATCH] HID: uclogic: Use KUNIT_EXPECT_MEMEQ

On 12/26/22 09:57, José Expósito wrote:
> Commit b8a926bea8b1 ("kunit: Introduce KUNIT_EXPECT_MEMEQ and
> KUNIT_EXPECT_MEMNEQ macros") introduced a new macro to compare blocks of
> memory and, if the test fails, print the result in a human friendly
> format. For example, this is the output of a test failure:
>
> Expected res == params->expected, but
> res ==
> 01 02 aa 00 00 00 03 bb 00 <00> 00 04 05
> params->expected ==
> 01 02 aa 00 00 00 03 bb 00 <01> 00 04 05
>
> Use this new macro to replace KUNIT_EXPECT_EQ + memcmp.
>
> Signed-off-by: José Expósito <[email protected]>

Reviewed-by: Maíra Canal <[email protected]>

Best Regards,
- Maíra Canal

> ---
> drivers/hid/hid-uclogic-rdesc-test.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-uclogic-rdesc-test.c b/drivers/hid/hid-uclogic-rdesc-test.c
> index b429c541bf2f..90bf4e586e01 100644
> --- a/drivers/hid/hid-uclogic-rdesc-test.c
> +++ b/drivers/hid/hid-uclogic-rdesc-test.c
> @@ -197,8 +197,7 @@ static void hid_test_uclogic_template(struct kunit *test)
> params->param_list,
> params->param_num);
> KUNIT_ASSERT_NOT_ERR_OR_NULL(test, res);
> - KUNIT_EXPECT_EQ(test, 0,
> - memcmp(res, params->expected, params->template_size));
> + KUNIT_EXPECT_MEMEQ(test, res, params->expected, params->template_size);
> kfree(res);
> }
>

2023-01-18 09:37:21

by Jiri Kosina

Subject: Re: [PATCH] HID: uclogic: Use KUNIT_EXPECT_MEMEQ

On Mon, 26 Dec 2022, José Expósito wrote:

> Commit b8a926bea8b1 ("kunit: Introduce KUNIT_EXPECT_MEMEQ and
> KUNIT_EXPECT_MEMNEQ macros") introduced a new macro to compare blocks of
> memory and, if the test fails, print the result in a human friendly
> format. For example, this is the output of a test failure:
>
> Expected res == params->expected, but
> res ==
> 01 02 aa 00 00 00 03 bb 00 <00> 00 04 05
> params->expected ==
> 01 02 aa 00 00 00 03 bb 00 <01> 00 04 05
>
> Use this new macro to replace KUNIT_EXPECT_EQ + memcmp.
>
> Signed-off-by: José Expósito <[email protected]>
> ---
> drivers/hid/hid-uclogic-rdesc-test.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-uclogic-rdesc-test.c b/drivers/hid/hid-uclogic-rdesc-test.c
> index b429c541bf2f..90bf4e586e01 100644
> --- a/drivers/hid/hid-uclogic-rdesc-test.c
> +++ b/drivers/hid/hid-uclogic-rdesc-test.c
> @@ -197,8 +197,7 @@ static void hid_test_uclogic_template(struct kunit *test)
> params->param_list,
> params->param_num);
> KUNIT_ASSERT_NOT_ERR_OR_NULL(test, res);
> - KUNIT_EXPECT_EQ(test, 0,
> - memcmp(res, params->expected, params->template_size));
> + KUNIT_EXPECT_MEMEQ(test, res, params->expected, params->template_size);
> kfree(res);

Applied, thanks.

--
Jiri Kosina
SUSE Labs