| Message ID | 20241101130254.473017-2-andrew.goodbody@linaro.org |
|---|---|
| State | Accepted |
| Commit | 66ca6622ee9c27e54250dbccd136c0445d402001 |
| Headers | show |
| Series | Fixes to allow 'ut bootm' to pass when run interactively | expand |
On Fri, 1 Nov 2024 at 07:03, Andrew Goodbody <andrew.goodbody@linaro.org> wrote: > > The function bootm_process_cmdline_env takes flags as its third > parameter, not a bool. Correct the usage by replacing 'true' > with BOOTM_CL_ALL so that the intent is clear. > A similar change was made throughtout this file in the previous spelling > commit to the one mentioned below as being fixed. > > Fixes: 4448fe8e4e7c ("bootm: Allow updating the bootargs in a buffer") > Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org> > --- > > test/bootm.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> > > diff --git a/test/bootm.c b/test/bootm.c > index 26c15552bf..5f57ecb337 100644 > --- a/test/bootm.c > +++ b/test/bootm.c > @@ -27,11 +27,11 @@ static int bootm_test_nop(struct unit_test_state *uts) > char buf[BUF_SIZE]; > > *buf = '\0'; > - ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, true)); > + ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL)); > ut_asserteq_str("", buf); > > strcpy(buf, "test"); > - ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, true)); > + ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL)); > ut_asserteq_str("test", buf); > > return 0; > @@ -45,21 +45,21 @@ static int bootm_test_nospace(struct unit_test_state *uts) > > /* Zero buffer size */ > *buf = '\0'; > - ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, 0, true)); > + ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, 0, BOOTM_CL_ALL)); > > /* Buffer string not terminated */ > memset(buf, 'a', BUF_SIZE); > - ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, true)); > + ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL)); > > /* Not enough space to copy string */ > memset(buf, '\0', BUF_SIZE); > memset(buf, 'a', BUF_SIZE / 2); > - ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, true)); > + ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL)); > > /* Just enough space */ > memset(buf, '\0', BUF_SIZE); > memset(buf, 'a', BUF_SIZE / 2 - 1); > - ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, true)); > + ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL)); > > return 0; > } > -- > 2.39.5 >
diff --git a/test/bootm.c b/test/bootm.c index 26c15552bf..5f57ecb337 100644 --- a/test/bootm.c +++ b/test/bootm.c @@ -27,11 +27,11 @@ static int bootm_test_nop(struct unit_test_state *uts) char buf[BUF_SIZE]; *buf = '\0'; - ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, true)); + ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL)); ut_asserteq_str("", buf); strcpy(buf, "test"); - ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, true)); + ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL)); ut_asserteq_str("test", buf); return 0; @@ -45,21 +45,21 @@ static int bootm_test_nospace(struct unit_test_state *uts) /* Zero buffer size */ *buf = '\0'; - ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, 0, true)); + ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, 0, BOOTM_CL_ALL)); /* Buffer string not terminated */ memset(buf, 'a', BUF_SIZE); - ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, true)); + ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL)); /* Not enough space to copy string */ memset(buf, '\0', BUF_SIZE); memset(buf, 'a', BUF_SIZE / 2); - ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, true)); + ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL)); /* Just enough space */ memset(buf, '\0', BUF_SIZE); memset(buf, 'a', BUF_SIZE / 2 - 1); - ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, true)); + ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL)); return 0; }
The function bootm_process_cmdline_env takes flags as its third parameter, not a bool. Correct the usage by replacing 'true' with BOOTM_CL_ALL so that the intent is clear. A similar change was made throughtout this file in the previous commit to the one mentioned below as being fixed. Fixes: 4448fe8e4e7c ("bootm: Allow updating the bootargs in a buffer") Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org> --- test/bootm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)