]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
test: font: Add dependencies on fonts
authorSimon Glass <sjg@chromium.org>
Mon, 2 Oct 2023 01:15:19 +0000 (19:15 -0600)
committerTom Rini <trini@konsulko.com>
Wed, 13 Dec 2023 23:39:05 +0000 (18:39 -0500)
The font test needs two fonts. If one is not available, skip out early,
to avoid an error.

Signed-off-by: Simon Glass <sjg@chromium.org>
test/cmd/font.c

index 40682e5ce4952829651c6439fb8fc3bfb97acc9a..1fe05c1ead51b87971a92db2416d674f064a2bd8 100644 (file)
@@ -30,13 +30,17 @@ static int font_test_base(struct unit_test_state *uts)
        ut_assertok(console_record_reset_enable());
        ut_assertok(run_command("font list", 0));
        ut_assert_nextline("nimbus_sans_l_regular");
-       ut_assert_nextline("cantoraone_regular");
+       if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_CANTORAONE))
+               ut_assert_nextline("cantoraone_regular");
        ut_assertok(ut_check_console_end(uts));
 
        ut_assertok(vidconsole_get_font_size(dev, &name, &size));
        ut_asserteq_str("nimbus_sans_l_regular", name);
        ut_asserteq(18, size);
 
+       if (!IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_CANTORAONE))
+               return 0;
+
        max_metrics = 1;
        if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE))
                max_metrics = IF_ENABLED_INT(CONFIG_CONSOLE_TRUETYPE,