From: Ruediger Meier Date: Wed, 7 Mar 2018 16:58:23 +0000 (+0100) Subject: tests: dont't timeout flock X-Git-Tag: v2.32~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55a680c17f258156006cfffd591c6a37864eaa04;p=thirdparty%2Futil-linux.git tests: dont't timeout flock The only situation where we would block endless is if another parallel test has the lock and hangs for another reason. This means that the other test would still keep hanging even if we timeout here. The user would have to interrupt the other test or the whole test-suite anyways. Note that we would certainly run into any timeout when using --parallel=200, so that all scsi tests start the same time. Signed-off-by: Ruediger Meier --- diff --git a/tests/functions.sh b/tests/functions.sh index 004ef0f3c4..376e78929f 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -744,7 +744,7 @@ function ts_lock { fd=$(ts_find_free_fd) || ts_skip "failed to find lock fd" eval "exec $fd>$lockfile" - flock --exclusive --timeout 30 $fd || ts_skip "failed to lock $resource" + flock --exclusive "$fd" || ts_skip "failed to lock $resource" TS_LOCKFILE_FD["$resource"]="$fd" ###echo "[$$ $TS_TESTNAME] Locked $resource"