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

* grub-core/tests/gfxterm_menu.c (gfxterm_menu): Handle out-of-memory

Browse source 
condition.
	* tests/grub_func_test.in: Increase memory allocation.
This commit is contained in:
Vladimir Serbinenko 2013-11-12 00:44:00 +01:00
parent 6a74c4dfff
commit 31747dd521
3 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-11-11 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/tests/gfxterm_menu.c (gfxterm_menu): Handle out-of-memory
condition.
* tests/grub_func_test.in: Increase memory allocation.
2013-11-11 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-11 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/osdep/unix/getroot.c [HAVE_STRUCT_STATFS_F_FSTYPENAME * grub-core/osdep/unix/getroot.c [HAVE_STRUCT_STATFS_F_FSTYPENAME

6
grub-core/tests/gfxterm_menu.c
View file

@ -116,6 +116,12 @@ gfxterm_menu (void)
grub_video_capture_start (&grub_test_video_modes[i], grub_video_capture_start (&grub_test_video_modes[i],
grub_video_fbstd_colors, grub_video_fbstd_colors,
grub_test_video_modes[i].number_of_colors); grub_test_video_modes[i].number_of_colors);
if (grub_errno)
{
grub_test_assert (0, "can't start capture: %d: %s",
grub_errno, grub_errmsg);
return;
}
grub_terminal_input_fake_sequence ((int []) { -1, -1, -1, GRUB_TERM_KEY_DOWN, -1, 'e', grub_terminal_input_fake_sequence ((int []) { -1, -1, -1, GRUB_TERM_KEY_DOWN, -1, 'e',
-1, GRUB_TERM_KEY_RIGHT, -1, 'x', -1, '\e', -1, '\e' }, 14); -1, GRUB_TERM_KEY_RIGHT, -1, 'x', -1, '\e', -1, '\e' }, 14);

3
tests/grub_func_test.in
View file

@ -3,7 +3,8 @@ set -e
. "@builddir@/grub-core/modinfo.sh" . "@builddir@/grub-core/modinfo.sh"
out=`echo all_functional_test | @builddir@/grub-shell --timeout=3600 --files="/boot/grub/fonts/unicode.pf2"="@builddir@/"unicode.pf2` # Increase memory as some of tests are high-resolution and need a lot of memory.
out=`echo all_functional_test | @builddir@/grub-shell --timeout=3600 --files="/boot/grub/fonts/unicode.pf2"="@builddir@/"unicode.pf2 --qemu-opts="-m 512"`
if [ "$(echo "$out" | tail -n 1)" != "ALL TESTS PASSED" ]; then if [ "$(echo "$out" | tail -n 1)" != "ALL TESTS PASSED" ]; then
echo "Functional test failure: $out" echo "Functional test failure: $out"