test: bdinfo: Add missing asserts

Calling into sub-test functions should be done using ut_assertok() so
that the test exits immediately on failure. Add those which are
missing.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c
index e4632742887affd005b15b6bf1b1beedb766dea1..4977d01f62d615507d35d2d3f0577fa683b13746 100644 (file)
--- a/test/cmd/bdinfo.c
+++ b/test/cmd/bdinfo.c
@@ -136,8 +136,8 @@ static int lmb_test_dump_region(struct unit_test_state *uts,
 static int lmb_test_dump_all(struct unit_test_state *uts, struct lmb *lmb)
 {
        ut_assert_nextline("lmb_dump_all:");
-       lmb_test_dump_region(uts, &lmb->memory, "memory");
-       lmb_test_dump_region(uts, &lmb->reserved, "reserved");
+       ut_assertok(lmb_test_dump_region(uts, &lmb->memory, "memory"));
+       ut_assertok(lmb_test_dump_region(uts, &lmb->reserved, "reserved"));
 
        return 0;
 }
@@ -191,7 +191,7 @@ static int bdinfo_test_all(struct unit_test_state *uts)
        ut_assertok(test_num_l(uts, "fdt_size", (ulong)gd->fdt_size));
 
        if (IS_ENABLED(CONFIG_VIDEO))
-               test_video_info(uts);
+               ut_assertok(test_video_info(uts));
 
        /* The gd->multi_dtb_fit may not be available, hence, #if below. */
 #if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
@@ -202,7 +202,7 @@ static int bdinfo_test_all(struct unit_test_state *uts)
                struct lmb lmb;
 
                lmb_init_and_reserve(&lmb, gd->bd, (void *)gd->fdt_blob);
-               lmb_test_dump_all(uts, &lmb);
+               ut_assertok(lmb_test_dump_all(uts, &lmb));
                if (IS_ENABLED(CONFIG_OF_REAL))
                        ut_assert_nextline("devicetree  = %s", fdtdec_get_srcname());
        }
@@ -227,6 +227,9 @@ static int bdinfo_test_all(struct unit_test_state *uts)
                ut_assertok(test_num_l(uts, "malloc base", gd_malloc_start()));
        }
 
+       if (IS_ENABLED(CONFIG_X86))
+               ut_check_skip_to_linen(uts, " high end   =");
+
        return 0;
 }