From nobody Tue May 13 12:42:42 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 4ZxbjG3RJKz5wnkc; Tue, 13 May 2025 12:42:42 +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 4ZxbjG140Vz3sbG; Tue, 13 May 2025 12:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140162; 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=Q89/Gqo/3bETsWUJEiU1jPZ85/tzqGC7VL6zCJbbZBI=; b=FcmPatW80t1GAM33xAnHyDA3E58craAZRI5XAQjHyrslAMjzORVXoSsRKvjre8SwRAG2yv yCzcNMDdyR334QgSjTZ1Ekp3a+79cG7BgJlMwB+AV8mFOKLMX5DICez8yCjf7gb5YNZQ1L fQlx9l2wYb2tv/3/trQSQajA3/VYBz0cbK2I/el1PbrZenNdFg7BzHj492YP3kw+t0FdUz FPjgnhBsgcHiWJHIAgD/JdxqjDV3NAZ//7WFjOFdnlSHnJ+Abpt9XxQne4Y8z9sY/jj7G6 SQpI1tRjIayKDobpO5JWABx7JzJByY0iTN0syLRFlyaQSQ2Gvx+qREhldTDDqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140162; 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=Q89/Gqo/3bETsWUJEiU1jPZ85/tzqGC7VL6zCJbbZBI=; b=ftgLkxKqHInZDcIXTTRt6X22DenAHWo9L/6780kPsw/jj5pZEbILgLw4h1xG3xKkEnhHZC 2oijCSzfpl7H4wp1PTzN7Ieyeb4HIzClGAg7LOcoKarNCJqQDw9m5XHrZdIheMgnF0qLVi M1fCWv6wAbbJPE/ffa9BV/PnOJ983A94u8MNLX3Qbsw9fEXO/JsLSWjpPiv3Qllh9OfefF 8Ku3c4zZGyy+WThOj5mlAc/46TrPW1wIDPB9BghLTcfCoCx8fYPKjzoEQzkvIrD22DEw3c EpygQOxxuWpLIxvMnJ3d7jYLMcE2aFRWS0U8dooz+3RKHm3oxx2juirmcAYDKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140162; a=rsa-sha256; cv=none; b=sxSgn1eVbq4nDuxkApLEK0aelFSQx00F7d68OWZZauhgzZyTbXJQEjn/usZt7ZGpCJak/B L0yu0T4DpRtxUyHKKLa7FjanaZb0hJTFKc0C7WpN9NbaYtqtOqVMUiVtT33kGSq2QZ0N9p DuKbYc/68y/bsdZURBqv0YV5TahwvDA6La7fUVyVCtjYFGyM3lfz/ypM5hdFw+H6zQ87Ak xuJXMop8lZrylW+XKd39MwioLMYYcAEQ0vOTLCJEHpgBCWrxgZySh8vydqLDkp+o3ed3Tf 4SJb2P/CCDdXDS+3g/119JgtnXCAN7g2PFIe34unXrdJCd7JGWa9nj6YWvszxg== 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 4ZxbjG0Zv6znMj; Tue, 13 May 2025 12:42:42 +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 54DCgg9v072663; Tue, 13 May 2025 12:42:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCggGB072660; Tue, 13 May 2025 12:42:42 GMT (envelope-from git) Date: Tue, 13 May 2025 12:42:42 GMT Message-Id: <202505131242.54DCggGB072660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 2d5e13c86a6a - releng/14.3 - rc/tests: Fix process flags checks using ps(1) 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 2d5e13c86a6ad3216ef091ec7c45456a7bafb308 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2d5e13c86a6ad3216ef091ec7c45456a7bafb308 commit 2d5e13c86a6ad3216ef091ec7c45456a7bafb308 Author: Olivier Certner AuthorDate: 2025-05-06 13:52:39 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 12:41:32 +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 (cherry picked from commit 646375408742dd5ed9abb174a621a3f8f65a56ef) (cherry picked from commit a69fe62604021f120206e4064ca7463195aeb3a0) Approved by: re (cperciva) --- 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 }