tests: Add 2GB to mem_needed running run-large-elf-file.sh with valgrind

Running under valgrind just requires even more free memory.

Signed-off-by: Mark Wielaard <mark@klomp.org>

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 9d15f8fa83c164c08affccdc8055d4e82a4da7fe..400588f4360bcf3336b4daf5a79b109677d3512b 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-01  Mark Wielaard  <mark@klomp.org>
+
+       * run-large-elf-file.sh: Add 2GB to mem_needed when running under
+       valgrind.
+
 2019-06-18  Mark Wielaard  <mark@klomp.org>
 
        * Makefile.am (TESTS): Add run-large-elf-file.sh.

diff --git a/tests/run-large-elf-file.sh b/tests/run-large-elf-file.sh
index c244c6020ec8175b9eae798cc1d6d863cf0313e0..6146cfed835e56394e1d9f869e748cb8cfce510a 100755 (executable)
--- a/tests/run-large-elf-file.sh
+++ b/tests/run-large-elf-file.sh
@@ -36,10 +36,16 @@ if test $space_available -lt 10; then
 fi
 
 # Make sure the files fit into memory, assume 6GB needed (2.5 * 2 + 1 extra).
+# Running under valgrind might need even more.
+mem_needed=6
+if [ "x$VALGRIND_CMD" != "x" ]; then
+  mem_needed=$[${mem_needed} + 2]
+fi
+echo "mem_needed: $mem_needed"
 mem_available=$(free -g | grep ^Mem: | awk -F ' +' '{print $7}')
 echo "mem_available: $mem_available"
-if test $mem_available -lt 6; then
-  echo "Need at least 6GB free available memory"
+if test $mem_available -lt $mem_needed; then
+  echo "Need at least ${mem_needed}GB free available memory"
   exit 77
 fi