run-large-elf-file.sh: skip if free memory information is not available

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 5b8a62246f675e24e6ce1b2b01443528fa33fc3b..369af37e971f24128de0431e8430c3744233c9f3 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-14  Andreas Schwab  <schwab@suse.de>
+
+       * run-large-elf-file.sh: Skip if available memory cannot be
+       determined.
+
 2019-11-14  Andreas Schwab  <schwab@suse.de>
 
        * dwelf_elf_e_machine_string.c (main): Clear errno before calling

diff --git a/tests/run-large-elf-file.sh b/tests/run-large-elf-file.sh
index 6146cfed835e56394e1d9f869e748cb8cfce510a..cbe3061599577177db5da92e0d8c3cc56c89dbdb 100755 (executable)
--- a/tests/run-large-elf-file.sh
+++ b/tests/run-large-elf-file.sh
@@ -42,9 +42,9 @@ 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}')
+mem_available=$(free -g 2>/dev/null | grep ^Mem: | awk -F ' +' '{print $7}')
 echo "mem_available: $mem_available"
-if test $mem_available -lt $mem_needed; then
+if test -z "$mem_available" || test $mem_available -lt $mem_needed; then
   echo "Need at least ${mem_needed}GB free available memory"
   exit 77
 fi