diff options
| author | Simon Glass <[email protected]> | 2024-01-07 17:14:55 -0700 |
|---|---|---|
| committer | Simon Glass <[email protected]> | 2024-10-18 14:10:21 -0600 |
| commit | f0feda90826556d2841ff4168f7d21902d992d70 (patch) | |
| tree | 5716e5690030e91c23e39931e4fff4ce64e9f667 /test/cmd | |
| parent | 112eb85c5a23a0c4a3f14d7099f18fd3128996ec (diff) | |
coreboot: Switch to a monospaced font
The default font is proportional, with different character widths.
Select a monospace font for coreboot so that the 'dm tree' output lines
up correctly.
Update the coreboot tests to match.
Signed-off-by: Simon Glass <[email protected]>
Diffstat (limited to 'test/cmd')
| -rw-r--r-- | test/cmd/font.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/test/cmd/font.c b/test/cmd/font.c index 2aea7b68c47..3335dd65bea 100644 --- a/test/cmd/font.c +++ b/test/cmd/font.c @@ -27,14 +27,20 @@ static int font_test_base(struct unit_test_state *uts) ut_assertok(uclass_first_device_err(UCLASS_VIDEO_CONSOLE, &dev)); ut_assertok(run_command("font list", 0)); - ut_assert_nextline("nimbus_sans_l_regular"); + if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_NIMBUS)) + ut_assert_nextline("nimbus_sans_l_regular"); + if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_ANKACODER)) + ut_assert_nextline("ankacoder_c75_r"); if (IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_CANTORAONE)) ut_assert_nextline("cantoraone_regular"); ut_assert_console_end(); 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_ANKACODER)) + ut_asserteq_str("ankacoder_c75_r", name); + else + ut_asserteq_str("nimbus_sans_l_regular", name); + ut_asserteq(CONFIG_CONSOLE_TRUETYPE_SIZE, size); if (!IS_ENABLED(CONFIG_CONSOLE_TRUETYPE_CANTORAONE)) return 0; |