diff options
| author | Ruediger Meier | 2018-03-07 17:58:23 +0100 |
|---|---|---|
| committer | Ruediger Meier | 2018-03-07 19:12:54 +0100 |
| commit | 55a680c17f258156006cfffd591c6a37864eaa04 (patch) | |
| tree | e7ebb33c5a00e7ba8cb6d7e423c309c2c3c47ad1 /tests/functions.sh | |
| parent | tests: don't use unlocked resources (diff) | |
| download | kernel-qcow2-util-linux-55a680c17f258156006cfffd591c6a37864eaa04.tar.gz kernel-qcow2-util-linux-55a680c17f258156006cfffd591c6a37864eaa04.tar.xz kernel-qcow2-util-linux-55a680c17f258156006cfffd591c6a37864eaa04.zip | |
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 <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/functions.sh')
| -rw-r--r-- | tests/functions.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/functions.sh b/tests/functions.sh index 004ef0f3c..376e78929 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" |