test: bdinfo: Test both bdinfo and bdinfo -a

Factor out the core of test for all bdinfo output into bdinfo_test_all()
and then reuse it to verify that both 'bdinfo' and 'bdinfo -a' print all
the bdinfo output.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c
index b2896e8eb4166341f5b46f7fef0d983348f002ca..509a8b5c586f4673b198f06f263386a6d2f00d56 100644 (file)
--- a/test/cmd/bdinfo.c
+++ b/test/cmd/bdinfo.c
@@ -130,15 +130,11 @@ static int lmb_test_dump_all(struct unit_test_state *uts, struct lmb *lmb)
        return 0;
 }
 
-static int bdinfo_test_full(struct unit_test_state *uts)
+static int bdinfo_test_all(struct unit_test_state *uts)
 {
        struct bd_info *bd = gd->bd;
        int i;
 
-       /* Test moving the working BDINFO to a new location */
-       ut_assertok(console_record_reset_enable());
-       ut_assertok(run_commandf("bdinfo"));
-
        ut_assertok(test_num_l(uts, "boot_params", 0));
 
        for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) {
@@ -212,6 +208,17 @@ static int bdinfo_test_full(struct unit_test_state *uts)
                ut_assertok(test_num_l(uts, "malloc base", gd_malloc_start()));
        }
 
+       return 0;
+}
+
+static int bdinfo_test_full(struct unit_test_state *uts)
+{
+       /* Test BDINFO full print */
+       ut_assertok(console_record_reset_enable());
+       ut_assertok(run_commandf("bdinfo"));
+       ut_assertok(bdinfo_test_all(uts));
+       ut_assertok(run_commandf("bdinfo -a"));
+       ut_assertok(bdinfo_test_all(uts));
        ut_assertok(ut_check_console_end(uts));
 
        return 0;