From nobody Thu May 08 17:38: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 4ZtfVT0YfJz5vNdR; Thu, 08 May 2025 17:38: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtfVS3DYKz3Hs2; Thu, 08 May 2025 17:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725888; 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=FI11wObJAPmfeyCgl7g1b3xEAlA9astTjgeCyzuuja8=; b=QE+20s9T6k1Dcfa/JvCtEOB8nPA3E28ArcpQQtbQhAUXhnfg2/JDQl6AtQB4h9IcP62vEk tw14OFZMZvAoeNJz2YUbOSZMEpGfRQLXz92XEVxpQtX3D8grwspH7aDnKg3bufpCpoLkUY R1Ncg7ug3LxqXcNfpVufn7VOpz3k5h8wE1YqPdYSSZ3NPVUfOrS+VjSKpoBF8D7VI7M/jq e6OgtKXpB2Me2cJm1AqvN1Pl4guObz7hnopwz3xbHshmLiyHXU18QMtS3LC/eu1FTELgSD dGatMVoJUlxuzl/wjQ/P/vIW5+lZNcmkC8wMrXGbJzZ6jMuQB7uDL2ZC/U41nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725888; 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=FI11wObJAPmfeyCgl7g1b3xEAlA9astTjgeCyzuuja8=; b=vgZdh9XYKI1WgqC+EEn3EnNruWjHBcXoxktUbZAmp5VihxsahWDsLKaROFu+0dXtsua7Ka AVSFRo2aDvuTjOYhIilwZtu/ErxTbUoGaPYPZ/VJTG9Sigk9yJOq60N2dlqEANZyrjL4rG JqTQBVqW83X4rzg3SKZIgyPE0xQM5m8D9zfx7ig2YwmfY9Gs41tzavN8LOrPZSbLXZhlRr mopDfNGaR2bu6hO2Bdmc20M5o5N+Qca5UzajWCPQ9vi6ZTjQbWOCNzjvElnTdBnUMhOsmL 3/XXFoMatjeA1PZrtzcv/KulILyk0LxulFb54bP9v2Bl4H+2WXALqCV1ypb4gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746725888; a=rsa-sha256; cv=none; b=quxel8wydZmTRSDBBYBZL9t53GosAdHYkT/J0798Bal63jZoE/BsAL8HTJPBwVE0TDddEk y996mIYP3qVXVc0qJ4xtgG651OGmfrqG4XU98fReb8enOkThaq23WvjsMQcRjRUIpnU7Ad TwMt0BP7CEN4FEx35hGLKF3UjpaqJiGY13CRxq0FBEfNwUVoX6i0XY6irI6vk09r2ZTJ1a mkqpPwnulFn0cyY8ve0FT+EBxgkjO0P1eXvSdwzA8V8iKyWTUDfCwnJyY64GLqwD0uQSfO 6yiq67n9hNxuIRVPgIKOtaupIR46SLnkhayQx5iJLMtDgH/Sm/fruH7Up4hG9Q== 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 4ZtfVS2jrBz8nx; Thu, 08 May 2025 17:38: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 548Hc8Cv042899; Thu, 8 May 2025 17:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548Hc8TK042896; Thu, 8 May 2025 17:38:08 GMT (envelope-from git) Date: Thu, 8 May 2025 17:38:08 GMT Message-Id: <202505081738.548Hc8TK042896@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: a69fe6260402 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a69fe62604021f120206e4064ca7463195aeb3a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a69fe62604021f120206e4064ca7463195aeb3a0 commit a69fe62604021f120206e4064ca7463195aeb3a0 Author: Olivier Certner AuthorDate: 2025-05-06 13:52:39 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 17:34:53 +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) --- 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 }