From nobody Thu Mar 20 02:53:19 2025 X-Original-To: dev-commits-src-main@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 4ZJ9B84b31z5r8Jy; Thu, 20 Mar 2025 02:53:20 +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 4ZJ9B767C8z3cBd; Thu, 20 Mar 2025 02:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439199; 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=i18HfQoJ4oym2B5hsKJ17oCaXiBGMdw7oiD098uIRxM=; b=bKW16X95qliVn57K166IwQqGPQTbUgMcBucBibXK9g0/qOVbb32hq0dpsdE7fMKUCSuK2B upjhoh4Cgshq7Ivk66kWooRUmmmbDqcs2KFZTXYA4mR+6F3oXyjFVRJHPQNBye5m5z428d 8IofK9rEiuK+WGm3zCIZuTATG9k63kMxnybgzyvNKpwDD9CzbeAq2YmbJcT7P4I5DBvokU SxKe4arTlkD10GgGdlSB+RkEut9mFpmfU3EylGRMXXPisNUt2vcXkTewo9OROwEZw7N8bk G2VD6FQietTrEQxdo596n/ymNRRqyI0ZtU758TsTFlJbgoRUbc2W5GM0J8skPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439199; a=rsa-sha256; cv=none; b=gJA8droSGVm5yxJDY/9R3YoG+mrDTTs7rdw0W0J403QtHK8s5CqsdfmFdBGV5dn7e5Nbd5 CRitIU9zTEaCZNXcVMaRjrtVlw4jPlc60w7Jn0szOpY3U41aM/3CxaukFzOdBDqgDpCf1Z 5cjRxdOqpOOF4smKLLBNlhv8CwCvPIR8oHrwIGjjLTWuymDwQBqHPtKgjtdfv3Hs+D28Z/ X5Cd2+eCmYLotJ47XThE2Ip6Gcs9jUMP0VV9qS8IA/VegB58WdWt4cpdG5MS3/tanBXMYM enF8j52fJInEtL5Svub9ev+7nKCs+Lb6eQ0Q33kiOQWbvbbIngdje8CVwAzhFg== 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=1742439199; 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=i18HfQoJ4oym2B5hsKJ17oCaXiBGMdw7oiD098uIRxM=; b=lE6VtZ6MDKKjDoU73O+8tlZ+LuOERotMeVZDJgU4BDGkyQH6+BH97Rxc2YqpnnirpqrmZf CS5G65SzMcJ6vZF/U5INnlU0FAZZBe/3+7zB7+wqLvw77et2A8po2wQDexbpskUBc4bw15 Z9ZTV7OFjrJoxTccm92YV9FpV0PIXiMaprQ4byowzn7aGABH5UwGbAxf2uhHMijXaSp2jD d9KKVMCFWuUKZmGPVzUbNopRO4YMeHuhsgMA1ZKLahHghO4K/ZokkA4k0Z9iUuiXSBkBPb ZjBcrFvY7ty2oNq8H9M1+LuwXgsOb1K7ZlGS3eDk0MfHSPZ0zcVL/wwgi9AmJw== 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 4ZJ9B75ZsLzn8H; Thu, 20 Mar 2025 02:53:19 +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 52K2rJ32046606; Thu, 20 Mar 2025 02:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rJrA046603; Thu, 20 Mar 2025 02:53:19 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:19 GMT Message-Id: <202503200253.52K2rJrA046603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 57b09e470dbd - main - pkill tests: Fix pkill usage in the pkill -x test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 57b09e470dbd84d1491a8972cf504b25e788a6c3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=57b09e470dbd84d1491a8972cf504b25e788a6c3 commit 57b09e470dbd84d1491a8972cf504b25e788a6c3 Author: Mark Johnston AuthorDate: 2025-03-15 11:12:45 +0000 Commit: Mark Johnston 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