[PATCH 8/9] test: bdinfo: Test bdinfo -m

[Simon Glass]

On Wed, 20 Sept 2023 at 16:58, Marek Vasut
<marek.vasut+renesas at mailbox.org> wrote:
>
> The bdinfo -m should print only the board memory layout.
> Test the expected output.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas at mailbox.org>
> ---
> Cc: Bin Meng <bmeng.cn at gmail.com>
> Cc: Mario Six <mario.six at gdsys.cc>
> Cc: Nikhil M Jain <n-jain1 at ti.com>
> Cc: Simon Glass <sjg at chromium.org>
> ---
>  test/cmd/bdinfo.c | 26 +++++++++++++++++++++++---
>  1 file changed, 23 insertions(+), 3 deletions(-)
>
> diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c
> index 2f34d877e5c..f090667fb42 100644
> --- a/test/cmd/bdinfo.c
> +++ b/test/cmd/bdinfo.c
> @@ -130,13 +130,11 @@ static int lmb_test_dump_all(struct unit_test_state *uts, struct lmb *lmb)
>         return 0;
>  }
>
> -static int bdinfo_test_all(struct unit_test_state *uts)
> +static int bdinfo_test_mem(struct unit_test_state *uts)

Since this is not a standalone test now, I think the word 'check' is
better than test. I try to reserve ''test' for a top-level test that
can be run.

>  {
>         struct bd_info *bd = gd->bd;
>         int i;
>
> -       ut_assertok(test_num_l(uts, "boot_params", 0));
> -
>         for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
>                 if (bd->bi_dram[i].size) {
>                         ut_assertok(test_num_l(uts, "DRAM bank", i));
> @@ -147,6 +145,15 @@ static int bdinfo_test_all(struct unit_test_state *uts)
>                 }
>         }
>
> +       return 0;
> +}
> +
> +static int bdinfo_test_all(struct unit_test_state *uts)
> +{
> +       ut_assertok(test_num_l(uts, "boot_params", 0));
> +
> +       ut_assertok(bdinfo_test_mem(uts));
> +
>         /* CONFIG_SYS_HAS_SRAM testing not supported */
>         ut_assertok(test_num_l(uts, "flashstart", 0));
>         ut_assertok(test_num_l(uts, "flashsize", 0));
> @@ -243,6 +250,19 @@ static int bdinfo_test_help(struct unit_test_state *uts)
>
>  BDINFO_TEST(bdinfo_test_help, UT_TESTF_CONSOLE_REC);
>
> +static int bdinfo_test_memory(struct unit_test_state *uts)
> +{
> +       /* Test BDINFO memory layout only print */
> +       ut_assertok(console_record_reset_enable());
> +       ut_assertok(run_commandf("bdinfo -m"));
> +       ut_assertok(bdinfo_test_mem(uts));
> +       ut_assertok(ut_check_console_end(uts));
> +
> +       return 0;
> +}
> +
> +BDINFO_TEST(bdinfo_test_memory, UT_TESTF_CONSOLE_REC);
> +
>  int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
>  {
>         struct unit_test *tests = UNIT_TEST_SUITE_START(bdinfo_test);
> --
> 2.40.1
>

Regards,
Simon