From nobody Thu May 8 17:38:09 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 4ZtfVV0Dncz5vN58; Thu, 08 May 2025 17:38:10 +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 4ZtfVT4BPpz3Hlf; Thu, 08 May 2025 17:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725889; 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=4EX3AYqMeib0nihUKxcjlboSilsPG3q+bmpSDue5ayM=; b=uSXsd+wUZw6gJ1jaLgUwRHJEIYaFHlEpw79HRAfkbFwDVguoY4IMNjvquSgu+YT/QTuklf IPu7y6Hajq0ygiroMyEyxoyIAvrjt/2HfVKO2MJGj/LmyeAJ/cvo6ku32eeuIqjSs/prrA WYg+AzrireZnOIF82XbbAYscteLy8IvgLKLXBuSWO7yft+ak31WF2QxAVBogItOjPUWVqn iix7BM9KwNG+vNlQCBV2dfF+zdSm594hS0Q7fDNuO0TuspZJrYFWtKbHtzCzEWvBu88gBR kKPsICzIb4mXBBepDGLRIKTEsypKtxFZYPzzfF2pjE5LWR0vwrYhTLX/GJivjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746725889; 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=4EX3AYqMeib0nihUKxcjlboSilsPG3q+bmpSDue5ayM=; b=Keaoz5I0JIDQZnoL+cQn2KfDfgBT7aTC8ONXmjS1Hl5wsHGicC4p6CdYmhbKzVdA6v6cKs ABAhJQXqM6zNVxBUMeGRfjtpfKGyEG5McMeerqiLb28YN2mwmyqY7n0e6m+s0TrPpx1hrl 4j0hUMLXmjMG0Ub8TcZYy8OoTYCDPXQ7K0fbpaVfQdjZBgLm2RejJ7SNgvXu3hwH7HkWC5 M0oguSjTfEl6yYjXLbg+Pr3NpTQm34yufkEaqekJAU7TKtrWniir/e2cHy5n8nZh2/uABF 57Ursm3dvRkxxXB/4QljJSJZW7+K2GJMAa/OFoPHHE1UMop/nSsXyVtDjP1kvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746725889; a=rsa-sha256; cv=none; b=G930gg4GXHEdBdNGv1/lfVa7FAOD6YOfezuCkkEaLz/IuTbgbJqSZrprlNQZafBxUq9mGX JKdCdG8LLkb3peHFVMuC5s4jHG2JR0cqrcLm7nTBIbKHT14hqyTWOB3N1jGhPOz3irKpky ZXJ9B427tDoZF4bZCdLJZhH98CYGW3WZvwFk4jBADkjHjVpNoNpJLcdHCrM9UK/Q0uWGhX YjYjpd7vAedyNy5agyPjKko+zgxQGX+MJzTIkkipwfM4PjuxIos2WrGdj4oTB9WaVHNX0M 2/ZY2nqfJWao0bHV0e+4nBeMbtS0yo7pYohfvlMQDTy95E3qjXxWi0D8Qvv4EA== 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 4ZtfVT3jycz8J2; Thu, 08 May 2025 17:38:09 +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 548Hc976042931; Thu, 8 May 2025 17:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548Hc95D042928; Thu, 8 May 2025 17:38:09 GMT (envelope-from git) Date: Thu, 8 May 2025 17:38:09 GMT Message-Id: <202505081738.548Hc95D042928@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: 5af18707c155 - stable/14 - stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change 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: 5af18707c155dca74071aa3bfb61160814f03bc3 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=5af18707c155dca74071aa3bfb61160814f03bc3 commit 5af18707c155dca74071aa3bfb61160814f03bc3 Author: Olivier Certner AuthorDate: 2025-05-06 14:43:33 +0000 Commit: Olivier Certner CommitDate: 2025-05-08 17:34:54 +0000 stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change Remove '-Uroot', as now '-U' selects processes based on their real user IDs, and since the program using them was launched as 'root', the equivalent now is just to remove it, as now ps(1) by default selects processes based on its effective UID (root) and their effective UIDs. It seems that matching on effective or real UID does not really matter in this test, but at least this change simplifies the command-line. MFC after: 1 day Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50200 (cherry picked from commit 1265d3b07eaa418e9c60800db93f3482ddbb6ae2) --- tools/test/stress2/misc/exlock2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/exlock2.sh b/tools/test/stress2/misc/exlock2.sh index 58a49919d86a..292e60e8d9f6 100755 --- a/tools/test/stress2/misc/exlock2.sh +++ b/tools/test/stress2/misc/exlock2.sh @@ -153,7 +153,7 @@ out: } #if defined(DEBUG) if (e != 0) { - system("ps -Uroot | grep -v grep | grep /tmp/exlock2 | "\ + system("ps | grep -v grep | grep /tmp/exlock2 | "\ "awk '{print $1}' | xargs procstat -f"); } #endif