Merge branch 'flock' of https://github.com/cgoesche/util-linux-fork

* 'flock' of https://github.com/cgoesche/util-linux-fork:
  tests: (flock) adjust commands to better track test coverage

# Conflicts:
#	tests/ts/flock/flock

diff --cc tests/ts/flock/flock
index 516c657420bd64f518569063490072900e8c9d16,b71e34487bec65293a6bac619dd5cd491d5d2c83..8b7a75aa3107a80096ed20ca32082583edf65645
--- 1/tests/ts/flock/flock
--- 2/tests/ts/flock/flock
+++ b/tests/ts/flock/flock
@@@ -94,8 -94,8 +94,8 @@@ for api in flock fcntl ; d
        cd "$TS_OUTDIR" || ts_failed "failed to change directory to $TS_OUTDIR"
        rm 4 2> /dev/null
        exec 4<>$TS_OUTDIR/lockfile || ts_log "Could not open lockfile"
-       $TS_CMD_FLOCK $api_arg --nonblock --exclusive --conflict-exit-code 123 4 \
+       $TS_CMD_FLOCK $api_arg --nonblocking --exclusive --conflict-exit-code 123 4 \
 -                    >> $TS_OUTPUT 2>> $TS_ERRLOG
 +                    >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
  
        rc="$?"