From 9db234ad09c12d34d2086057fd92ae448e931ac4 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Tue, 22 Sep 2015 23:23:26 +0200 Subject: maint: use adaptive approach for `ulimit -v` based tests When configured with either 'symlinks' or 'shebangs' as value for the --enable-single-binary option, tests based on `ulimit -v` are skipped. The reason is that the multicall 'coreutils' binary requires much more memory due to shared libraries being loaded, and the size of the 'date' binary (~290KiB) compared to the multicall binary (~5MiB), of course. Finally, in the case of 'shebangs', the starting shell requires more memory, too Instead of using hard-coded values for the memory limit, use an adaptive approach: first determine the amount of memory for a similar, yet more trivial invocation of the command, and then do the real test run using that limit (plus some buffer in some cases). * init.cfg (require_ulimit_v_): Remove function. (get_min_ulimit_v_): Add function to determine the minimum memory limit required for a given command in an adaptive way. * cfg.mk (sc_prohibit_test_ulimit_without_require_): Change the name of the above function in the syntax-check rule. * tests/cp/link-heap.sh: Use the above function to determine the minimum memory required to run a command simpler than in the real test run. Use that limit plus a buffer there. While at it, change to list of commands in the subshell to fail also if the beginning `ulimit -v` fails. * tests/dd/no-allocate.sh: Likewise. * tests/misc/csplit-heap.sh: Likewise. * tests/misc/cut-huge-range.sh: Likewise. * tests/misc/head-c.sh: Likewise. * tests/misc/printf-surprise.sh: Likewise. * tests/split/line-bytes.sh: Likewise. * tests/rm/many-dir-entries-vs-OOM.sh: Likewise - doing it separately for each program under test. --- tests/misc/csplit-heap.sh | 9 ++++++--- tests/misc/cut-huge-range.sh | 12 +++++++----- tests/misc/head-c.sh | 6 ++++-- tests/misc/printf-surprise.sh | 5 +++-- 4 files changed, 20 insertions(+), 12 deletions(-) (limited to 'tests/misc') diff --git a/tests/misc/csplit-heap.sh b/tests/misc/csplit-heap.sh index 9e51cb15f..0ffe70ad4 100755 --- a/tests/misc/csplit-heap.sh +++ b/tests/misc/csplit-heap.sh @@ -19,11 +19,14 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ csplit -require_ulimit_v_ +# Determine basic amount of memory needed. +{ echo y; echo n; } > f || framework_failure_ +vm=$(get_min_ulimit_v_ csplit -z f %n%1) \ + || skip_ "this shell lacks ulimit support" ( - ulimit -v 20000 - { yes | head -n2500000; echo n; } | csplit -z - %n%1 + ulimit -v $vm \ + && { yes | head -n2500000; echo n; } | csplit -z - %n%1 ) || fail=1 Exit $fail diff --git a/tests/misc/cut-huge-range.sh b/tests/misc/cut-huge-range.sh index 035d8d087..4df2fc066 100755 --- a/tests/misc/cut-huge-range.sh +++ b/tests/misc/cut-huge-range.sh @@ -18,9 +18,11 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cut -require_ulimit_v_ getlimits_ +vm=$(get_min_ulimit_v_ cut -b1 /dev/null) \ + || skip_ "this shell lacks ulimit support" + # sed script to subtract one from the input. # Each input line should consist of a positive decimal number. # Each output line's number is one less than the input's. @@ -49,15 +51,15 @@ CUT_MAX=$(echo $SIZE_MAX | sed "$subtract_one") # From coreutils-8.10 through 8.20, this would make cut try to allocate # a 256MiB bit vector. With a 20MB limit on VM, the following would fail. -(ulimit -v 20000; : | cut -b$CUT_MAX- > err 2>&1) || fail=1 +(ulimit -v $vm && : | cut -b$CUT_MAX- > err 2>&1) || fail=1 # Up to and including coreutils-8.21, cut would allocate possibly needed # memory upfront. Subsequently extra memory is no longer needed. -(ulimit -v 20000; : | cut -b1-$CUT_MAX >> err 2>&1) || fail=1 +(ulimit -v $vm && : | cut -b1-$CUT_MAX >> err 2>&1) || fail=1 # Explicitly disallow values above CUT_MAX -(ulimit -v 20000; : | returns_ 1 cut -b$SIZE_MAX 2>/dev/null) || fail=1 -(ulimit -v 20000; : | returns_ 1 cut -b$SIZE_OFLOW 2>/dev/null) || fail=1 +(ulimit -v $vm && : | returns_ 1 cut -b$SIZE_MAX 2>/dev/null) || fail=1 +(ulimit -v $vm && : | returns_ 1 cut -b$SIZE_OFLOW 2>/dev/null) || fail=1 compare /dev/null err || fail=1 diff --git a/tests/misc/head-c.sh b/tests/misc/head-c.sh index a553a55bc..ab821ac61 100755 --- a/tests/misc/head-c.sh +++ b/tests/misc/head-c.sh @@ -18,9 +18,11 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ head -require_ulimit_v_ getlimits_ +vm=$(get_min_ulimit_v_ head -c1 /dev/null) \ + || skip_ "this shell lacks ulimit support" + # exercise the fix of 2001-08-18, based on test case from Ian Bruce echo abc > in || framework_failure_ (head -c1; head -c1) < in > out || fail=1 @@ -40,7 +42,7 @@ esac # Only allocate memory as needed. # Coreutils <= 8.21 would allocate memory up front # based on the value passed to -c -(ulimit -v 20000; head --bytes=-$SSIZE_MAX < /dev/null) || fail=1 +(ulimit -v $vm && head --bytes=-$SSIZE_MAX < /dev/null) || fail=1 # Make sure it works on funny files in /proc and /sys. diff --git a/tests/misc/printf-surprise.sh b/tests/misc/printf-surprise.sh index 20e6b0988..8480693fc 100755 --- a/tests/misc/printf-surprise.sh +++ b/tests/misc/printf-surprise.sh @@ -20,8 +20,9 @@ prog=printf . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ printf -require_ulimit_v_ +vm=$(get_min_ulimit_v_ env $prog %20f 0) \ + || skip_ "this shell lacks ulimit support" # Up to coreutils-6.9, "printf %.Nf 0" would encounter an ENOMEM internal # error from glibc's printf(3) function whenever N was large relative to @@ -60,7 +61,7 @@ head -c 10 fifo > out & pid=$! # Choosing the virtual memory limit, 11000 is enough, but 10000 is too # little and provokes a "memory exhausted" diagnostic on FreeBSD 9.0-p3. -( ulimit -v 15000; env $prog %20000000f 0 2>err-msg > fifo ) +( ulimit -v $vm && env $prog %20000000f 0 2>err-msg > fifo ) exit=$? # Map this longer, and rarer, diagnostic to the common one. -- cgit v1.2.3-54-g00ecf