From f8b4c3b6b3a9633faa2d8240b6b4d62259caae5b Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Nov 18 2013 10:48:07 +0000 Subject: * 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 e1989f7..05d25e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2013-11-18 Vladimir Serbinenko + * 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 + * grub-core/tests/cmdline_cat_test.c: Don't reload unifont if it's already loaded. This saves memory needed for tests, diff --git a/grub-core/tests/gfxterm_menu.c b/grub-core/tests/gfxterm_menu.c index 879fbc0..8f63dc2 100644 --- 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 ee7058f..f120496 100644 --- 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");