* tests/grub_func_test.in: Decrease RAM size to 512M. With less

	fragmentation 512M is enough.

diff --git a/ChangeLog b/ChangeLog
index 6b66c8e5120bc5afb9f838d696121f9df91b7f14..8978c7f461cdea7752fd90fe431304d6c93290e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * tests/grub_func_test.in: Decrease RAM size to 512M. With less
+       fragmentation 512M is enough.
+
 2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/mm.c (grub_real_malloc): Decrease cut-off of moving the

diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in
index cfb200cf9e4a45c4ae0b321ff128944c3f745860..c8cc263763377fd23d6c7f1eca49c1edafe530a7 100644 (file)
--- a/tests/grub_func_test.in
+++ b/tests/grub_func_test.in
@@ -3,8 +3,16 @@ set -e
 
 . "@builddir@/grub-core/modinfo.sh"
 
+case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
+    # PLATFORM: Max RAM is 256M
+    mips-qemu_mips | mipsel-qemu_mips)
+       mem=256M;;
+    *)
+       mem=512M;;
+esac
+
 # 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 1G"`
+out=`echo all_functional_test | @builddir@/grub-shell --timeout=3600 --files="/boot/grub/fonts/unicode.pf2"="@builddir@/"unicode.pf2 --qemu-opts="-m $mem"`
 
 if [ "$(echo "$out" | tail -n 1)" != "ALL TESTS PASSED" ]; then
   echo "Functional test failure: $out"