diff options
| author | Bernhard Voelker <mail@bernhard-voelker.de> | 2015-09-22 23:23:26 +0200 |
|---|---|---|
| committer | Bernhard Voelker <mail@bernhard-voelker.de> | 2015-09-22 23:23:26 +0200 |
| commit | 9db234ad09c12d34d2086057fd92ae448e931ac4 (patch) | |
| tree | aa72ec7b895c3aec9d6a72c986586547768b96cc /tests/cp | |
| parent | 50e61bfdb9d2df30e1db97ae4ebec7044e087d29 (diff) | |
| download | coreutils-9db234ad09c12d34d2086057fd92ae448e931ac4.tar.xz | |
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.
Diffstat (limited to 'tests/cp')
| -rwxr-xr-x | tests/cp/link-heap.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/cp/link-heap.sh b/tests/cp/link-heap.sh index 901a92fc7..b65223a59 100755 --- a/tests/cp/link-heap.sh +++ b/tests/cp/link-heap.sh @@ -19,7 +19,12 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ cp expensive_ -require_ulimit_v_ + +# Determine basic amount of memory needed for 'cp -al'. +touch f || framework_failure_ +vm=$(get_min_ulimit_v_ cp -al f f2) \ + || skip_ "this shell lacks ulimit support" +rm f f2 || framework_failure_ a=$(printf %031d 0) b=$(printf %031d 1) @@ -31,7 +36,7 @@ cp -al $a $b || framework_failure_ mkdir e || framework_failure_ mv $a $b e || framework_failure_ -# Increased from 20000 to 22000 in 2012, for pre-F18 rawhide. -(ulimit -v 22000; cp -al e f) || fail=1 +# Allow cp(1) to use 4MiB more virtual memory than for the above trivial case. +(ulimit -v $(($vm+4000)) && cp -al e f) || fail=1 Exit $fail |