test: cmd/bdinfo: consider arch_print_bdinfo() output

On x86 commit 9b35dbc93fd4 ("x86: Show the timestamp counter with bdinfo")
has added another bdinfo output line.

On RISC-V commit 66b5ee9c558e ("riscv: add RISC-V fields to bdinfo
command") implemented arch_print_bdinfo().

Update the bdinfo test accordingly.

Fixes: 9b35dbc93fd4 ("x86: Show the timestamp counter with bdinfo")
Fixes: 66b5ee9c558e ("riscv: add RISC-V fields to bdinfo command")
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c
index 214b237152b245428de531cc3a5b74905e36b3a4..28d448a086664c30d276e8ad9a9e6280e03af695 100644 (file)
--- a/test/cmd/bdinfo.c
+++ b/test/cmd/bdinfo.c
@@ -215,8 +215,15 @@ static int bdinfo_test_all(struct unit_test_state *uts)
                ut_assertok(test_num_l(uts, "malloc base", gd_malloc_start()));
        }
 
+       /* Check arch_print_bdinfo() output */
        if (IS_ENABLED(CONFIG_X86))
-               ut_check_skip_to_linen(uts, " high end   =");
+               ut_check_skip_to_linen(uts, "tsc");
+
+#ifdef CONFIG_RISCV
+       ut_check_console_linen(uts, "boot hart");
+       if (gd->arch.firmware_fdt_addr)
+               ut_check_console_linen(uts, "firmware fdt");
+#endif
 
        return 0;
 }