From 4bad7d1eada6a0690ab30eed2e5ae42c6fd7dacd Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 14 Nov 2019 16:50:26 +0100 Subject: run-large-elf-file.sh: skip if free memory information is not available --- tests/ChangeLog | 5 +++++ tests/run-large-elf-file.sh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index 5b8a6224..369af37e 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2019-11-14 Andreas Schwab + + * run-large-elf-file.sh: Skip if available memory cannot be + determined. + 2019-11-14 Andreas Schwab * 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 6146cfed..cbe30615 100755 --- 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 -- cgit v1.2.3