| Message ID | 20210523170056.3039406-1-seanga2@gmail.com |
|---|---|
| State | Accepted |
| Commit | cb6c9c83e2f1cb5b96851445dbf3dea8541cb212 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | test: Remove duplicate macro | expand |
On 5/23/21 7:00 PM, Sean Anderson wrote: > ut_asserteq_strn is defined twice. Remove one definition. > > Fixes: 33d7edfd5f ("test: Add a way to check part of a console line or skip it") > Signed-off-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
On Sun, May 23, 2021 at 01:00:56PM -0400, Sean Anderson wrote: > ut_asserteq_strn is defined twice. Remove one definition. > > Fixes: 33d7edfd5f ("test: Add a way to check part of a console line or skip it") > Signed-off-by: Sean Anderson <seanga2@gmail.com> > Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Applied to u-boot/master, thanks!
diff --git a/include/test/ut.h b/include/test/ut.h index fbbba286ee..656e25fe57 100644 --- a/include/test/ut.h +++ b/include/test/ut.h @@ -177,23 +177,6 @@ int ut_check_console_dump(struct unit_test_state *uts, int total_bytes); } \ } -/* - * Assert that two string expressions are equal, up to length of the - * first - */ -#define ut_asserteq_strn(expr1, expr2) { \ - const char *_val1 = (expr1), *_val2 = (expr2); \ - int _len = strlen(_val1); \ - \ - if (memcmp(_val1, _val2, _len)) { \ - ut_failf(uts, __FILE__, __LINE__, __func__, \ - #expr1 " = " #expr2, \ - "Expected \"%.*s\", got \"%.*s\"", \ - _len, _val1, _len, _val2); \ - return CMD_RET_FAILURE; \ - } \ -} - /* Assert that two memory areas are equal */ #define ut_asserteq_mem(expr1, expr2, len) { \ const u8 *_val1 = (u8 *)(expr1), *_val2 = (u8 *)(expr2); \
ut_asserteq_strn is defined twice. Remove one definition. Fixes: 33d7edfd5f ("test: Add a way to check part of a console line or skip it") Signed-off-by: Sean Anderson <seanga2@gmail.com> --- include/test/ut.h | 17 ----------------- 1 file changed, 17 deletions(-)