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

	if no unifont is found.
	Restore original keyboard.

diff --git a/ChangeLog b/ChangeLog
index de8acba51535e22ee1e33e9464206f89cf2f199b..ef402f8fc0e2d0f4ee5a02b58198f75a538c3d10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * grub-core/loader/i386/linux.c (grub_linux_setup_video): Add

diff --git a/grub-core/tests/videotest_checksum.c b/grub-core/tests/videotest_checksum.c
index e57dae73c23d0d0ac5194a5ee93fb961de0fd09b..3c70f8c47d53ace2a2a4880847ebb1d011a96999 100644 (file)
--- a/grub-core/tests/videotest_checksum.c
+++ b/grub-core/tests/videotest_checksum.c
@@ -265,7 +265,12 @@ static void
 videotest_checksum (void)
 {
   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++)
     {
       grub_video_capture_start (&tests[i].mode_info,
@@ -277,6 +282,8 @@ videotest_checksum (void)
 
       char *args[] = { 0 };
       grub_command_execute ("videotest", 0, args);
+
+      grub_terminal_input_fake_sequence_end ();
       grub_video_checksum_end ();
       grub_video_capture_end ();
     }