|
 |
31004e6 |
From f27f3a18a9854098f5efc8e5472e21a4ffcdf0e6 Mon Sep 17 00:00:00 2001
|
|
|
31004e6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
Date: Thu, 2 May 2013 18:08:42 +0200
|
|
|
f74b50e |
Subject: [PATCH 403/482] * grub-core/tests/videotest_checksum.c
|
|
|
31004e6 |
(videotest_checksum): Error out if no unifont is found.
|
|
|
31004e6 |
Restore original keyboard.
|
|
|
31004e6 |
|
|
|
31004e6 |
---
|
|
|
31004e6 |
ChangeLog | 6 ++++++
|
|
|
31004e6 |
grub-core/tests/videotest_checksum.c | 9 ++++++++-
|
|
|
31004e6 |
2 files changed, 14 insertions(+), 1 deletion(-)
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
31004e6 |
index de8acba..ef402f8 100644
|
|
|
31004e6 |
--- a/ChangeLog
|
|
|
31004e6 |
+++ b/ChangeLog
|
|
|
31004e6 |
@@ -1,5 +1,11 @@
|
|
|
31004e6 |
2013-05-02 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
|
|
|
31004e6 |
+ * grub-core/tests/videotest_checksum.c (videotest_checksum): Error out
|
|
|
31004e6 |
+ if no unifont is found.
|
|
|
31004e6 |
+ Restore original keyboard.
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+2013-05-02 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
+
|
|
|
31004e6 |
* grub-core/loader/i386/linux.c (grub_linux_setup_video): Add
|
|
|
31004e6 |
GRUB_VIDEO_ADAPTER_CAPTURE: to handled drived ids.
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/grub-core/tests/videotest_checksum.c b/grub-core/tests/videotest_checksum.c
|
|
|
31004e6 |
index e57dae7..3c70f8c 100644
|
|
|
31004e6 |
--- a/grub-core/tests/videotest_checksum.c
|
|
|
31004e6 |
+++ b/grub-core/tests/videotest_checksum.c
|
|
|
31004e6 |
@@ -265,7 +265,12 @@ static void
|
|
|
31004e6 |
videotest_checksum (void)
|
|
|
31004e6 |
{
|
|
|
31004e6 |
unsigned i;
|
|
|
31004e6 |
- grub_font_load ("unicode");
|
|
|
31004e6 |
+ if (grub_font_load ("unicode") == 0)
|
|
|
31004e6 |
+ {
|
|
|
31004e6 |
+ grub_test_assert (0, "unicode font not found: %s", grub_errmsg);
|
|
|
31004e6 |
+ return;
|
|
|
31004e6 |
+ }
|
|
|
31004e6 |
+
|
|
|
31004e6 |
for (i = 0; i < ARRAY_SIZE (tests); i++)
|
|
|
31004e6 |
{
|
|
|
31004e6 |
grub_video_capture_start (&tests[i].mode_info,
|
|
|
31004e6 |
@@ -277,6 +282,8 @@ videotest_checksum (void)
|
|
|
31004e6 |
|
|
|
31004e6 |
char *args[] = { 0 };
|
|
|
31004e6 |
grub_command_execute ("videotest", 0, args);
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+ grub_terminal_input_fake_sequence_end ();
|
|
|
31004e6 |
grub_video_checksum_end ();
|
|
|
31004e6 |
grub_video_capture_end ();
|
|
|
31004e6 |
}
|
|
|
31004e6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
31004e6 |
|