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

* grub-core/tests/videotest_checksum.c (videotest_checksum): Error out

Browse source 
if no unifont is found.
	Restore original keyboard.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-05-02 18:08:42 +02:00
parent 095accd14b
commit 3f3e7326b7
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-05-02 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/tests/videotest_checksum.c (videotest_checksum): Error out
if no unifont is found.
Restore original keyboard.
2013-05-02 Vladimir Serbinenko <phcoder@gmail.com> 2013-05-02 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/linux.c (grub_linux_setup_video): Add * grub-core/loader/i386/linux.c (grub_linux_setup_video): Add

9
grub-core/tests/videotest_checksum.c
View file

@ -265,7 +265,12 @@ static void
videotest_checksum (void) videotest_checksum (void)
{ {
unsigned i; unsigned i;
grub_font_load ("unicode"); if (grub_font_load ("unicode") == 0)
{
grub_test_assert (0, "unicode font not found: %s", grub_errmsg);
return;
}
for (i = 0; i < ARRAY_SIZE (tests); i++) for (i = 0; i < ARRAY_SIZE (tests); i++)
{ {
grub_video_capture_start (&tests[i].mode_info, grub_video_capture_start (&tests[i].mode_info,
@ -277,6 +282,8 @@ videotest_checksum (void)
char *args[] = { 0 }; char *args[] = { 0 };
grub_command_execute ("videotest", 0, args); grub_command_execute ("videotest", 0, args);
grub_terminal_input_fake_sequence_end ();
grub_video_checksum_end (); grub_video_checksum_end ();
grub_video_capture_end (); grub_video_capture_end ();
} }