]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
* grub-core/tests/cmdline_cat_test.c (cmdline_cat_test): Ignore errors
authorVladimir Serbinenko <phcoder@gmail.com>
Sun, 17 Nov 2013 01:13:33 +0000 (02:13 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Sun, 17 Nov 2013 01:13:33 +0000 (02:13 +0100)
of loading gfxterm as gfxterm is embed in kernel on some platforms.
* grub-core/tests/gfxterm_menu.c (gfxterm_menu): Likewise.
Load gfxmenu.

ChangeLog
grub-core/tests/cmdline_cat_test.c
grub-core/tests/gfxterm_menu.c

index 23011288e4d91f004f597852be4c97b3b452e093..40fd400d6abbe6601076f393caf8f0a88515bbcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/tests/cmdline_cat_test.c (cmdline_cat_test): Ignore errors
+       of loading gfxterm as gfxterm is embed in kernel on some platforms.
+       * grub-core/tests/gfxterm_menu.c (gfxterm_menu): Likewise.
+       Load gfxmenu.
+
 2013-11-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * tests/core_compress_test.in: Use full arguments as grub-mkimage-extra
index 55e90a9d79e5d59ac406f8cd77020c0e2e623b50..3337d34cb73190787ee3ba49a00ac5fd322286d4 100644 (file)
@@ -74,6 +74,7 @@ cmdline_cat_test (void)
   unsigned i;
 
   grub_dl_load ("gfxterm");
+  grub_errno = GRUB_ERR_NONE;
 
   if (grub_font_load ("unicode") == 0)
     {
index 9158759096c52a7850f439b49282e759436f4ce3..68531892f5bcfd9e267069f5014efe7fd761e71a 100644 (file)
@@ -101,6 +101,10 @@ gfxterm_menu (void)
   grub_dl_load ("gettext");
   grub_dl_load ("gfxterm");
 
+  grub_errno = GRUB_ERR_NONE;
+
+  grub_dl_load ("gfxmenu");
+
   if (grub_font_load ("unicode") == 0)
     {
       grub_test_assert (0, "unicode font not found: %s", grub_errmsg);