From ea7c1a7d90cb21772ba6a1e04dd6507f54dab7fd Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 18 Nov 2013 14:38:31 +0100 Subject: [PATCH] * grub-core/tests/videotest_checksum.c: Don't reload unifont if it's already loaded. This saves memory needed for tests, --- ChangeLog | 5 +++++ grub-core/tests/videotest_checksum.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ae8f24f14..b38485d0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-18 Vladimir Serbinenko + + * grub-core/tests/videotest_checksum.c: Don't reload unifont if it's + already loaded. This saves memory needed for tests, + 2013-11-18 Vladimir Serbinenko * util/grub-mkrescue.c (main): Fix a typo to make yeeloong part diff --git a/grub-core/tests/videotest_checksum.c b/grub-core/tests/videotest_checksum.c index f120496b6..a4bff5ed8 100644 --- a/grub-core/tests/videotest_checksum.c +++ b/grub-core/tests/videotest_checksum.c @@ -26,13 +26,22 @@ GRUB_MOD_LICENSE ("GPLv3+"); +#define FONT_NAME "Unknown Regular 16" + /* Functional test main method. */ static void videotest_checksum (void) { unsigned i; + grub_font_t font; - if (grub_font_load ("unicode") == 0) + font = grub_font_get (FONT_NAME); + if (font && grub_strcmp (font->name, FONT_NAME) != 0) + font = 0; + if (!font) + font = grub_font_load ("unicode"); + + if (!font) { grub_test_assert (0, "unicode font not found: %s", grub_errmsg); return;