vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/tests/cmdline_cat_test.c (cmdline_cat_test): Ignore errors

Browse source 
of loading gfxterm as gfxterm is embed in kernel on some platforms.
	* grub-core/tests/gfxterm_menu.c (gfxterm_menu): Likewise.
	Load gfxmenu.
This commit is contained in:
Vladimir Serbinenko 2013-11-17 02:13:33 +01:00
parent b80c2d6d4b
commit 0ab8e025c1
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2013-11-17 Vladimir Serbinenko <phcoder@gmail.com>
* tests/core_compress_test.in: Use full arguments as grub-mkimage-extra * tests/core_compress_test.in: Use full arguments as grub-mkimage-extra

1
grub-core/tests/cmdline_cat_test.c
View file

@ -74,6 +74,7 @@ cmdline_cat_test (void)
unsigned i; unsigned i;
grub_dl_load ("gfxterm"); grub_dl_load ("gfxterm");
grub_errno = GRUB_ERR_NONE;
if (grub_font_load ("unicode") == 0) if (grub_font_load ("unicode") == 0)
{ {

4
grub-core/tests/gfxterm_menu.c
View file

@ -101,6 +101,10 @@ gfxterm_menu (void)
grub_dl_load ("gettext"); grub_dl_load ("gettext");
grub_dl_load ("gfxterm"); grub_dl_load ("gfxterm");
grub_errno = GRUB_ERR_NONE;
grub_dl_load ("gfxmenu");
if (grub_font_load ("unicode") == 0) if (grub_font_load ("unicode") == 0)
{ {
grub_test_assert (0, "unicode font not found: %s", grub_errmsg); grub_test_assert (0, "unicode font not found: %s", grub_errmsg);