diff options
| -rwxr-xr-x | tests/dd/no-allocate.sh | 8 | ||||
| -rwxr-xr-x | tests/misc/cut-huge-range.sh | 2 | ||||
| -rwxr-xr-x | tests/misc/head-c.sh | 2 | ||||
| -rwxr-xr-x | tests/misc/printf-surprise.sh | 3 |
4 files changed, 7 insertions, 8 deletions
diff --git a/tests/dd/no-allocate.sh b/tests/dd/no-allocate.sh index d122e3544..f6ce00391 100755 --- a/tests/dd/no-allocate.sh +++ b/tests/dd/no-allocate.sh @@ -21,9 +21,9 @@ print_ver_ dd # Determine basic amount of memory needed. echo . > f || framework_failure_ -vm=$(get_min_ulimit_v_ dd if=f of=f2 status=none) \ +vm=$(get_min_ulimit_v_ timeout 10 dd if=f of=f2 status=none) \ || skip_ "this shell lacks ulimit support" -rm -f f || framework_failure_ +rm f f2 || framework_failure_ # count and skip are zero, we don't need to allocate memory (ulimit -v $vm && dd bs=30M count=0) || fail=1 @@ -43,8 +43,8 @@ check_dd_seek_alloc() { timeout 10 dd count=1 if=/dev/zero of=tape& # Allocate buffer and read from the "tape" - (ulimit -v $(($vm+4000)) \ - && timeout 10 dd $dd_buf=30M $dd_op=1 count=0 $dd_file=tape) + (ulimit -v $vm \ + && timeout 10 dd $dd_buf=30M $dd_op=1 count=0 $dd_file=tape) local ret=$? # Be defensive in case the tape reader is blocked for some reason diff --git a/tests/misc/cut-huge-range.sh b/tests/misc/cut-huge-range.sh index 4df2fc066..633ca8572 100755 --- a/tests/misc/cut-huge-range.sh +++ b/tests/misc/cut-huge-range.sh @@ -50,7 +50,7 @@ subtract_one=' 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. +# a 256MiB bit vector. (ulimit -v $vm && : | cut -b$CUT_MAX- > err 2>&1) || fail=1 # Up to and including coreutils-8.21, cut would allocate possibly needed diff --git a/tests/misc/head-c.sh b/tests/misc/head-c.sh index ab821ac61..0c63e3a90 100755 --- a/tests/misc/head-c.sh +++ b/tests/misc/head-c.sh @@ -42,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 $vm && head --bytes=-$SSIZE_MAX < /dev/null) || fail=1 +(ulimit -v $(($vm+1000)) && 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 8480693fc..f098bc13d 100755 --- a/tests/misc/printf-surprise.sh +++ b/tests/misc/printf-surprise.sh @@ -59,8 +59,7 @@ cleanup_() { kill $pid 2>/dev/null && wait $pid; } 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. +# Trigger large mem allocation failure ( ulimit -v $vm && env $prog %20000000f 0 2>err-msg > fifo ) exit=$? |