From nobody Sun Apr 6 22:51:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZW6yP2Yvsz5s8Sx; Sun, 06 Apr 2025 22:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZW6yN597hz3KQD; Sun, 06 Apr 2025 22:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743979868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tlzc4EQLtEj+YDo3E3QY+1Ezj5q47gX0nW7OxAIFOXk=; b=pB4hf42SxtOiToE6hqB9qpd/zeNj1FKSjqKgnzZHg/l0hda4oynAp74Elrv1sDALxR2bgX Bye35arUWgOio1Q4rUX52QrK+mfME1QtJmw76YLq410f7UOrnoLkNwEg8LyxryPQ/kX9Ah f3KMyb2WvvfbsCU401VMqeEYRovA92kQYB4eoZp/0CXr1HsuJnhv8X4C+b0Mqrd5n+3rDe j3bSncyOXwr54MfvNnfAz7tP8DUGu4Dc+VItkzDNmHW2EmpvXnV3X3qW6cfblZ0In6kzVg 2qcpXNNvWiZ99qtYsmpE2AEZ8Z1wHs9WKpVLTYVvQzdP5CSoTVDuNIvN/YrpGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743979868; a=rsa-sha256; cv=none; b=FsCqYSNd9QzVAfRmAZNKEbCcz0QlRfDS6Y4gdBXbkU1qZYztY64k3iku6F6kDjmCkP+AJR JRmpTpDhGSwkcDt3Mqs+0xSYQIj+aeK3Q01oXMzSqSWf7qDLyVwY3jR09xfA07BuPms8iK 8LFNAkcTBxtwzY1QpruzY0CPdFpV89rs1go7pHjHbyEVtLulgXAb4Qo1OMStCPnCN/nV7y GOO//ZG2b5yvKlzdFEFI/0J2/c6C+i2fkFr/2WegSIG/kG92Lh1QfykBm7BwSn8eVOs5ky bxZZ7ttqeJhl/90RFwAokq71YyiU11rS25301ZfZ/HEx2y3M0Nv55n/3TUIW1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743979868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tlzc4EQLtEj+YDo3E3QY+1Ezj5q47gX0nW7OxAIFOXk=; b=YoC9t20xMgqyFoUIsrh5KOhYBdWEiRH1P5XrRpnmtRzS80Vr4OrYtlR+scn5YMnAW6EvR5 L3Z03O5SPnhrigSutMhnfISUBaUrCYi+AMJmgCYP4yvUnb5A+HFge5TWWyKhXlD/JYUaE6 aCFzIo4rNFqw1Xe4GaJhCnX6dGokdCSC1uVvp6VTH1ceRau11Rni5Y7lWkUOC6e7y3e/SV oau6n3dHbrP+vXN1FSFydDxWbPLuq5vhOkcWLWlYYWFYxg/p70RINnWAY7fMJeyW98xtj7 cP+wgNwsrJYzbDBmJ4FbrJ86O6zEY/vilXQpLXE1twdc05wDXTIH7RzasVqWUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZW6yN4Vqwz5WC; Sun, 06 Apr 2025 22:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 536Mp85C077022; Sun, 6 Apr 2025 22:51:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 536Mp8pW077019; Sun, 6 Apr 2025 22:51:08 GMT (envelope-from git) Date: Sun, 6 Apr 2025 22:51:08 GMT Message-Id: <202504062251.536Mp8pW077019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e1a3b7ff9fe6 - stable/14 - pkill tests: Fix pkill usage in the pkill -x test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e1a3b7ff9fe6152b4a112cc47c5155c4c9da9b74 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e1a3b7ff9fe6152b4a112cc47c5155c4c9da9b74 commit e1a3b7ff9fe6152b4a112cc47c5155c4c9da9b74 Author: Mark Johnston AuthorDate: 2025-03-15 11:12:45 +0000 Commit: Mark Johnston CommitDate: 2025-04-06 13:54:03 +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 (cherry picked from commit 57b09e470dbd84d1491a8972cf504b25e788a6c3) --- 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