git: 57b09e470dbd - main - pkill tests: Fix pkill usage in the pkill -x test

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Thu, 20 Mar 2025 02:53:19 UTC
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=57b09e470dbd84d1491a8972cf504b25e788a6c3

commit 57b09e470dbd84d1491a8972cf504b25e788a6c3
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-03-15 11:12:45 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-03-20 02:52:49 +0000

    pkill tests: Fix pkill usage in the pkill -x test
    
    The target process name(s) mark the beginning of the command's
    positional parameters, so the -P filter wasn't getting applied as
    intended.  As a result, the second "pkill -x sleep -P $$" would kill all
    sleep(1) processes in the system, which can cause problems when running
    tests in parallel.
    
    MFC after:      2 weeks
---
 bin/pkill/tests/pkill-x_test.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/pkill/tests/pkill-x_test.sh b/bin/pkill/tests/pkill-x_test.sh
index 9247a85863c0..5fe751f9ec72 100644
--- a/bin/pkill/tests/pkill-x_test.sh
+++ b/bin/pkill/tests/pkill-x_test.sh
@@ -9,13 +9,13 @@ sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
-pkill -x slee -P $$
+pkill -P $$ -x slee
 if [ $? -ne 0 ]; then
 	echo "ok 1 - $name"
 else
 	echo "not ok 1 - $name"
 fi
-pkill -x sleep -P $$
+pkill -P $$ -x sleep
 if [ $? -eq 0 ]; then
 	echo "ok 2 - $name"
 else
@@ -28,13 +28,13 @@ sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
 $sleep 5 &
 sleep 0.3
-pkill -x -f "$sleep " -P $$
+pkill -P $$ -x -f "$sleep "
 if [ $? -ne 0 ]; then
 	echo "ok 3 - $name"
 else
 	echo "not ok 3 - $name"
 fi
-pkill -x -f "$sleep 5" -P $$
+pkill -P $$ -x -f "$sleep 5"
 if [ $? -eq 0 ]; then
 	echo "ok 4 - $name"
 else