X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=test%2Ftestlib.sh.in;h=c63d27d13858ae659cf6f8fc7bd66138bb8a2717;hb=4203f7c88d5f17dc10075d371ca97aa6359ba71b;hp=047db870e7fb0c68015467b7de77a8b2547cd32b;hpb=ac2a1722b71e98010324ed46235e96bfa6e672f5;p=tinc diff --git a/test/testlib.sh.in b/test/testlib.sh.in index 047db870..c63d27d1 100644 --- a/test/testlib.sh.in +++ b/test/testlib.sh.in @@ -185,21 +185,11 @@ expect_code() { # Runs its arguments with timeout(1) or gtimeout(1) if either are installed. # Usage: try_limit_time 10 command --with --args if type timeout >/dev/null; then - if is_busybox; then - # busybox does not support --foreground - try_limit_time() { - time=$1 - shift - timeout "$time" "$@" - } - else - # BSD and GNU timeout do not require special handling - try_limit_time() { - time=$1 - shift - timeout --foreground "$time" "$@" - } - fi + try_limit_time() { + time=$1 + shift + timeout "$time" "$@" + } else try_limit_time() { echo >&2 "timeout was not found, running without time limits!"