* grub-core/tests/gfxterm_menu.c: Skip high-resolution tests on

	low-memory platforms where we don't have enough memory for them.
	* grub-core/tests/videotest_checksum.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index e1989f780e64940367adca240a53898c788916cb..05d25e9583f9763dbdb6d8135ef898b42a058bba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/tests/gfxterm_menu.c: Skip high-resolution tests on
+       low-memory platforms where we don't have enough memory for them.
+       * grub-core/tests/videotest_checksum.c: Likewise.
+
 2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/tests/cmdline_cat_test.c: Don't reload unifont if it's

diff --git a/grub-core/tests/gfxterm_menu.c b/grub-core/tests/gfxterm_menu.c
index 879fbc003b38879efc8e5c079485e8bc42e5ff4f..8f63dc27a35bd769ecb5d94599de3ba9e97cf5dc 100644 (file)
--- a/grub-core/tests/gfxterm_menu.c
+++ b/grub-core/tests/gfxterm_menu.c
@@ -125,7 +125,16 @@ gfxterm_menu (void)
   for (j = 0; j < ARRAY_SIZE (tests); j++)
     for (i = 0; i < GRUB_TEST_VIDEO_SMALL_N_MODES; i++)
       {
-       grub_uint64_t start = grub_get_time_ms ();
+       grub_uint64_t start;
+
+#if defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_IEEE1275)
+       if (grub_test_video_modes[i].width > 1024)
+         continue;
+       if (grub_strcmp (tests[j].name, "gfxmenu") == 0
+           && grub_test_video_modes[i].width > 800)
+         continue;
+#endif
+       start = grub_get_time_ms ();
 
        grub_video_capture_start (&grub_test_video_modes[i],
                                  grub_video_fbstd_colors,

diff --git a/grub-core/tests/videotest_checksum.c b/grub-core/tests/videotest_checksum.c
index ee7058f516fddf8df699be995223d0975b4d2290..f120496b609c609e16cde6e9af3e18bb346da957 100644 (file)
--- a/grub-core/tests/videotest_checksum.c
+++ b/grub-core/tests/videotest_checksum.c
@@ -40,9 +40,20 @@ videotest_checksum (void)
 
   for (i = 0; i < ARRAY_SIZE (grub_test_video_modes); i++)
     {
-      grub_video_capture_start (&grub_test_video_modes[i],
-                               grub_video_fbstd_colors,
-                               grub_test_video_modes[i].number_of_colors);
+      grub_err_t err;
+#if defined (GRUB_MACHINE_MIPS_QEMU_MIPS) || defined (GRUB_MACHINE_IEEE1275)
+      if (grub_test_video_modes[i].width > 1024)
+       continue;
+#endif
+      err = grub_video_capture_start (&grub_test_video_modes[i],
+                                     grub_video_fbstd_colors,
+                                     grub_test_video_modes[i].number_of_colors);
+      if (err)
+       {
+         grub_test_assert (0, "can't start capture: %s", grub_errmsg);
+         grub_print_error ();
+         continue;
+       }
       grub_terminal_input_fake_sequence ((int []) { '\n' }, 1);
 
       grub_video_checksum ("videotest");