none/tests/amd64-linux/map_32bits.vgtest fails too easily

On various systems none/tests/amd64-linux/map_32bits.vgtest fails with:
first mmap: Cannot allocate memory.

The problem is that the --aspace-minaddr is too tight. Newer glibc seem
to mmap some memory and so even our first mmap with MMAP_32BIT will fail.

The solution is to make a bit more memory < 2GB available.
If there is 16MB available the test always seems to succeed without
needing too many tries. The original 256K is too low.

https://bugs.kde.org/show_bug.cgi?id=406422

diff --git a/NEWS b/NEWS
index 7faba7e92d7c27cc4f0f383fc9211ac6eee143dd..bf7b3dd8436ad2f5e84868f48fd2c49dcc43553e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -152,6 +152,7 @@ where XXXXXX is the bug number as listed below.
 406355  mcsignopass, mcsigpass, mcbreak fail due to difference in gdb output
 406357  gdbserver_tests fails because of gdb output change
 406360  memcheck/tests/libstdc++.supp needs more supression variants
+406422  none/tests/amd64-linux/map_32bits.vgtest fails too easily
 n-i-bz  add syswrap for PTRACE_GET|SET_THREAD_AREA on amd64.
 n-i-bz  Fix callgrind_annotate non deterministic order for equal total
 n-i-bz  callgrind_annotate --threshold=100 does not print all functions.

diff --git a/none/tests/amd64-linux/map_32bits.vgtest b/none/tests/amd64-linux/map_32bits.vgtest
index 2b7f3a04a601d0aae72befe843f586eeede4a40b..43011e3cd9d39fd566caa1f64b40f7a4f577e91c 100644 (file)
--- a/none/tests/amd64-linux/map_32bits.vgtest
+++ b/none/tests/amd64-linux/map_32bits.vgtest
@@ -1,5 +1,5 @@
 prog: map_32bits
 # take a big aspacemgr minaddr, to quickly reach the 2GB limit
-vgopts: -q --aspace-minaddr=0x7ff60000
+vgopts: -q --aspace-minaddr=0x7f000000
 stderr_filter: filter_stderr