diff options
Diffstat (limited to 'tests/misc')
| -rwxr-xr-x | tests/misc/cut-huge-range.sh | 3 | ||||
| -rwxr-xr-x | tests/misc/timeout-parameters.sh | 19 |
2 files changed, 8 insertions, 14 deletions
diff --git a/tests/misc/cut-huge-range.sh b/tests/misc/cut-huge-range.sh index 92b62a97b..2b8b70387 100755 --- a/tests/misc/cut-huge-range.sh +++ b/tests/misc/cut-huge-range.sh @@ -46,7 +46,8 @@ subtract_one=' # Ensure we can cut up to our sentinel value. # This is currently SIZE_MAX, but could be raised to UINTMAX_MAX # if we didn't allocate memory for each line as a unit. -# Don't use expr to subtract one, since SIZE_MAX may exceed its maximum value. +# Don't use expr to subtract one, +# since SIZE_MAX may exceed its maximum value. CUT_MAX=$(echo $SIZE_MAX | sed "$subtract_one") # From coreutils-8.10 through 8.20, this would make cut try to allocate diff --git a/tests/misc/timeout-parameters.sh b/tests/misc/timeout-parameters.sh index 881e60d66..14c9b669b 100755 --- a/tests/misc/timeout-parameters.sh +++ b/tests/misc/timeout-parameters.sh @@ -38,29 +38,22 @@ test $? = 125 || fail=1 # It was seen on 32 bit Linux/HPPA that a kernel time_t overflowed, # thus causing the timer to fire immediately. # So verify that doesn't happen before checking large timeouts -KERNEL_OVERFLOW_LIMIT=$(expr $TIME_T_MAX - $(date +%s) + 100) +KERNEL_OVERFLOW_LIMIT=$(expr $TIME_T_MAX - $(date +%s) + 100) || + skip_ "failed to adjust TIME_T_MAX $TIME_T_MAX" timeout $KERNEL_OVERFLOW_LIMIT sleep 0 if test $? != 124; then # timeout overflow - timeout $UINT_OFLOW sleep 0 - test $? = 0 || fail=1 + timeout $UINT_OFLOW sleep 0 || fail=1 # timeout overflow - timeout $(expr $UINT_MAX / 86400 + 1)d sleep 0 - test $? = 0 || fail=1 - - # timeout overflow - timeout 999999999999999999999999999999999999999999999999999999999999d sleep 0 - test $? = 0 || fail=1 + timeout ${TIME_T_OFLOW}d sleep 0 || fail=1 # floating point notation - timeout 2.34e+5d sleep 0 - test $? = 0 || fail=1 + timeout 2.34e+5d sleep 0 || fail=1 fi # floating point notation -timeout 2.34 sleep 0 -test $? = 0 || fail=1 +timeout 2.34 sleep 0 || fail=1 # nanoseconds potentially supported timeout .999999999 sleep 0 || fail=1 |