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

	already loaded. This saves memory needed for tests,

diff --git a/ChangeLog b/ChangeLog
index ae8f24f14ef498b0552b6a5762dba751a37239e7..b38485d0b6dbfdcf3d5937eff151f9e583b6a764 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * 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 f120496b609c609e16cde6e9af3e18bb346da957..a4bff5ed8754dbde4dc83511ff11e59f586a0781 100644 (file)
--- 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;
+
+  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 (grub_font_load ("unicode") == 0)
+  if (!font)
     {
       grub_test_assert (0, "unicode font not found: %s", grub_errmsg);
       return;