On Sat, 2019-06-29 at 01:47 +0200, Mark Wielaard wrote:
> FAIL: run-large-elf-file.sh
> ===========================
>
> long_bit: 64
> space_available: 38
> mem_available: 7
> 1024+0 records in
> 1024+0 records out
> 1073741824 bytes (1.1 GB) copied, 3.72662 s, 288 MB/s
> addsections 2 testfile38 2147483648
> add_sections 'testfile38': 2 (sec_size: 2147483648)
> setshstrndx: 10
> strip -o testfile38.strip -f testfile38.debug testfile38
> elflint --gnu testfile38.strip
> No errors
> elflint --gnu -d testfile38.debug
> No errors
> unstrip testfile38.strip testfile38.debug
> elfcmp testfile38.strip
> addsections 2 testfile27 2147483648
> add_sections 'testfile27': 2 (sec_size: 2147483648)
> setshstrndx: 30
> strip -o testfile27.strip -f testfile27.debug testfile27
> /srv/buildbot/worker/elfutils-centos-x86_64/build/elfutils-
> 0.176/_build/src/strip: while writing 'testfile27.debug.SjHGU1': out
> of memory
> [...]
> So, this is running the test under valgrind.
> In which case we might need even more free memory available.
>
> The test did succeed earlier on the worker, not under valgrind.
So I pushed the attached commit to just increase the amount of free
memory needed when running under valgrind.
Cheers,
Mrk
From 31c8b3f098b0654db8f573b2a15d5b6d07d4d3b0 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <m...@klomp.org>
Date: Mon, 1 Jul 2019 17:08:43 +0200
Subject: [PATCH] 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 <m...@klomp.org>
---
tests/ChangeLog | 5 +++++
tests/run-large-elf-file.sh | 10 ++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 9d15f8f..400588f 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-01 Mark Wielaard <m...@klomp.org>
+
+ * run-large-elf-file.sh: Add 2GB to mem_needed when running under
+ valgrind.
+
2019-06-18 Mark Wielaard <m...@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 c244c60..6146cfe 100755
--- 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
--
1.8.3.1
