From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11810 invoked by alias); 14 Nov 2019 15:50:30 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 11793 invoked by uid 89); 14 Nov 2019 15:50:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.3 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-15.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy=awk X-Spam-Status: No, score=-15.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 14 Nov 2019 15:50:28 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 9389BAF76 for ; Thu, 14 Nov 2019 15:50:26 +0000 (UTC) From: Andreas Schwab To: elfutils-devel@sourceware.org Subject: [PATCH] run-large-elf-file.sh: skip if free memory information is not available X-Yow: I'm young.. I'm HEALTHY.. I can HIKE THRU CAPT GROGAN'S LUMBAR REGIONS! Date: Thu, 14 Nov 2019 15:50:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2019-q4/txt/msg00135.txt.bz2 --- 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 97b8dedb..f37f6cd6 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-09-02 Mark Wielaard * run-readelf-s.sh: Add --dyn-syms case. 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 -- 2.24.0 -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."