From: Karel Zak <kzak@redhat.com>
Date: Wed, 6 May 2026 10:23:06 +0000 (+0200)
Subject: Merge branch 'flock' of https://github.com/cgoesche/util-linux-fork
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=be02fd3824a64fb8f2dc82e6f863e397a513eeff;p=thirdparty%2Futil-linux.git

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
---

be02fd3824a64fb8f2dc82e6f863e397a513eeff
diff --cc tests/ts/flock/flock
index 516c657420,b71e34487b..8b7a75aa31
--- a/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="$?"