* grub-core/tests/videotest_checksum.c: Don't reload unifont if it's

already loaded. This saves memory needed for tests,
This commit is contained in:
Vladimir Serbinenko 2013-11-18 14:38:31 +01:00
parent 96adefdb12
commit ea7c1a7d90
2 changed files with 15 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2013-11-18 Vladimir Serbinenko <phcoder@gmail.com>
* 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 <phcoder@gmail.com> 2013-11-18 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkrescue.c (main): Fix a typo to make yeeloong part * util/grub-mkrescue.c (main): Fix a typo to make yeeloong part

View file

@ -26,13 +26,22 @@
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
#define FONT_NAME "Unknown Regular 16"
/* Functional test main method. */ /* Functional test main method. */
static void static void
videotest_checksum (void) videotest_checksum (void)
{ {
unsigned i; 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); grub_test_assert (0, "unicode font not found: %s", grub_errmsg);
return; return;