From nobody Wed May 7 09:15:36 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 4ZsqP53DY9z5w29S; Wed, 07 May 2025 09:15:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsqP515ZZz3HmH; Wed, 07 May 2025 09:15:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746609337; 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=dn8BZZ5GWNry4Mat1+SWY8/b6vfU9yJIzBHxNWHGRRg=; b=EAxzA6giia9Bwg2x8HJuA6oNeC1tBHOWO86ILfaTJRIMfI+OgzKyK3GWhVZl/XEf4Ba8h8 txT8m7JdbmTH6V7GUzTgEGHu43T+f7as0zjYhNrGSmZQ00cXgDUS3OIlQwUWV0DW2d5guF ehUpZ89HNje+n4Wg98EdUTvUlh0JexxtVl603PSbIy7OZGix0RUjME8/Xi1KOW1o/OuCre TD7xgqSriyk/ArNqs6HjLNVnbmWcb/LiQoxFyScM6yaZfx9JzU9R5YcpFmMMLo78YllH5/ +tGzge8iCg7myWyhAAnJPZ3G/uQa+l+Z82sccR5xl+iLWrOBeVQ7TqHTQWBSsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746609337; 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=dn8BZZ5GWNry4Mat1+SWY8/b6vfU9yJIzBHxNWHGRRg=; b=Spyp560ejgvIgUSa+YBUJlxQs6vFcdYt5p+RhLpFYCT7ymvbP/ZE7Ew3imWdlO/BcIJTke NhPwHEja0SGB55tfo+mGNxHil3LO1h7FuzAoMJOUZj34am9DPa1GsP1Z1aKL5SQwMkBuHd UQQ8X7o6lNtOCOVDugL+vmH1x3Bj7GigcxpnZRouPw1RAgUUlPbZsfJi6URJdgNybqVOqA 95kJ6d1rwlVexPToA0a59E2E1JmsZLwYcA38IdAJWFbii+6XJzOf0BoFh1UC9pCUv4Q2Ic Xmoh4iweY2W/Gr+jd8fkHaSXghRAUex2juZnZa2WI9G4n3CwZA0ioTp+yydRvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746609337; a=rsa-sha256; cv=none; b=BcpoN4+jtBITVOcqWln0nIFcPGc5JFQWBgT2fGtIpcIO5AB/wByKlF0xDAkuPdBSWKyjdV 9a7QRbIwNN1zPBz6RkVUAbhiJvtzpxrQr8sxlZZaems7XIkhLl9sQh9QnVpWnucaKQh2qA lEfjMm4JHI8N/LWUAK6ehiq608xOPpcPj0xbP+iAWKbCYUucvSbCmvsADPihbHAxZV0xGS RFvsn5u5ArvvKWZu8AfBto++v5Sx8fw+mPBG0aWoCz+jmE9k8KsX6WzL9mbtchOV25boqZ FZR79XbwMsClAuZGGG53bIFh1qumKlCpZR3awCJftL3rL3gtHJeyJZVWRDL+HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZsqP50T8Zz7FH; Wed, 07 May 2025 09:15:37 +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 5479FaYq098693; Wed, 7 May 2025 09:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5479FaLG098690; Wed, 7 May 2025 09:15:36 GMT (envelope-from git) Date: Wed, 7 May 2025 09:15:36 GMT Message-Id: <202505070915.5479FaLG098690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 646375408742 - main - rc/tests: Fix process flags checks using ps(1) 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 646375408742dd5ed9abb174a621a3f8f65a56ef Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=646375408742dd5ed9abb174a621a3f8f65a56ef commit 646375408742dd5ed9abb174a621a3f8f65a56ef Author: Olivier Certner AuthorDate: 2025-05-06 13:52:39 +0000 Commit: Olivier Certner CommitDate: 2025-05-07 09:14:55 +0000 rc/tests: Fix process flags checks using ps(1) These checks use ps(1) with both the '-p' and '-a' flags, which worked so far as ps(1)'s '-a' option was buggy. Since the fix in commit "ps(1): Make '-a' and '-A' always show all processes" (93a94ce731a89b56), such a command-line always selects all processes, making the specified '-p' useless and the test wrong. Remove the useless '-a'. While here, remove the redundant '-x', as '-p' implies '-x' by default. MFC after: 1 day Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50201 --- libexec/rc/tests/rc_subr_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh index f004354fe52e..60f77c2c2de3 100644 --- a/libexec/rc/tests/rc_subr_test.sh +++ b/libexec/rc/tests/rc_subr_test.sh @@ -59,9 +59,9 @@ oomprotect_all_body() atf_check -s exit:0 -o inline:"Starting ${__name}.\n" -e empty \ /bin/sh "$__script" "$__name" "$__pidfile" "$__childpidfile" onestart atf_check -s exit:0 -o match:'^..1..... .......1$' -e empty \ - ps -p "$(cat "$__pidfile")" -ax -o flags,flags2 + ps -p "$(cat "$__pidfile")" -o flags,flags2 atf_check -s exit:0 -o match:'^..1..... .......1$' -e empty \ - ps -p "$(cat "$__childpidfile")" -ax -o flags,flags2 + ps -p "$(cat "$__childpidfile")" -o flags,flags2 atf_check -s exit:0 -o ignore -e empty \ /bin/sh "$__script" "$__name" "$__pidfile" "$__childpidfile" onestop }