From: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
Date: Sun, 3 May 2026 01:31:20 +0000 (-0400)
Subject: tests: (flock) adjust commands to better track test coverage
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=f16e58c1cb5ccc7105c3b05afe386cb01826f080;p=thirdparty%2Futil-linux.git

tests: (flock) adjust commands to better track test coverage

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
---

diff --git a/tests/ts/flock/flock b/tests/ts/flock/flock
index 004a6b532..b71e34487 100755
--- a/tests/ts/flock/flock
+++ b/tests/ts/flock/flock
@@ -69,12 +69,12 @@ for api in flock fcntl ; do
 		|| ts_die "timeout waiting for flock child"
 
 	ts_init_subtest "${subtest_prefix}non-block"
-	do_lock "${api_arg} --nonblock --conflict-exit-code 123" 123 "You will never see this!"
+	do_lock "${api_arg} --nonblocking --conflict-exit-code 123" 123 "You will never see this!"
 	ts_finalize_subtest
 
 
 	ts_init_subtest "${subtest_prefix}no-fork"
-	do_lock "${api_arg} --no-fork --nonblock --conflict-exit-code 123" 123 "You will never see this!"
+	do_lock "${api_arg} --no-fork --nonblocking --conflict-exit-code 123" 123 "You will never see this!"
 	ts_finalize_subtest
 
 
@@ -86,7 +86,7 @@ for api in flock fcntl ; do
 	# this is the same as non-block test (exclusive lock is the default), but here
 	# we explicitly specify --exclusive on command line
 	ts_init_subtest "${subtest_prefix}exclusive"
-	do_lock "${api_arg} --nonblock --exclusive --conflict-exit-code 123" 123 "You will never see this!"
+	do_lock "${api_arg} --nb --exclusive --conflict-exit-code 123" 123 "You will never see this!"
 	ts_finalize_subtest
 
 
@@ -94,7 +94,7 @@ for api in flock fcntl ; do
 	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
 
 	rc="$?"