From nobody Tue May 13 12:42:44 2025 X-Original-To: dev-commits-src-all@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 4ZxbjJ5wBBz5wnQV; Tue, 13 May 2025 12:42:44 +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 4ZxbjJ34wkz3sqy; Tue, 13 May 2025 12:42:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140164; 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=12Rqsug7iR2E/vefdFxOavWmuYRWX6SYjuPE6Cu6tcA=; b=cdGwvoslY/mxXEoaGLGH98+yZYudafxPS3kRtfJdXnEpe0+69Hqx4VPjeWh3GD7As71Mjt /9eB1JqC3qJl32JnbZ9huDynh1Go1fKXcVyFdteDtcUMdzDvSJELBLWD45jUZo46jHz/1r mt8MpZiZNpv0txG2JVy3pOnFB9t6L6cOKCyt/DI2YiHqCvKetzxLq9TAg9Ci9TPQ2+UDsv 4eiYeGFuUWTqYC6OHkKBjCYtrqg2MJU4PzopfIpC2ZWcNHn0HdCfiOiadXSGAxegZ0GJor NHbWIEb/nqTjuMSOXT6/yKZOqO/8Vi8zIhpcZ5qiLELPOC1xR0x9HtOGh0xVdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747140164; 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=12Rqsug7iR2E/vefdFxOavWmuYRWX6SYjuPE6Cu6tcA=; b=f0Wmd94BE2hI37V/KjmLuaBYGMzrEq3E0NXTn1o3XCwgT+kAc+ZedF3AzYlBb2iY/nZd29 lVJipQLXve9cuVI+NQbfAriWwd+j3+HJzW3S1KPa2LqD1uD3HciuQnkLvlDtwkvS6RNGRa gRy6AQtDKfVy7ARG/UvSVB5Rlm9H9pAer9hxgULgMtlD0YF4JSNKMeywmB5DjsymcGT/H2 74JfaZDe2jMxJC3KoGe1RSaA7jKG70Tr/YTLA+YHQM9Xwq9m96XlOrqkysq6K2EQY76Ey2 KVk6k9fHw9Ja5y5BeXxuf1/1KtvQFer8aLyeMzM8m9PenU9gWAfPFG59+00xrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747140164; a=rsa-sha256; cv=none; b=oZrXRR137hGbAfrEo4jgIIX9rLOiqig8sklVdJCs5hj6O0mBPah141D7P2gLqoG09Y3L1/ 2OrkZwE0Xnu41hhWI74gT0Xxep/IiBV81UGEMLSc4BjKhbwHiDGVSpFnxm1LrNn5lSYttw 004seVWY+CQuIjQC0MxRBMGmb8RDcd2AVq8mqJ+ET4grkhif5ktHx7HkeU2eEZcktC8ND1 jJyhrFrk+c8cLWTL8D7PuobyAOx/somGYu7AQI596RFpyME/91kND50v/naXepDREnpIXX ZpcuXrpLwfC5z2D/oGph/Ue0ce70MM7xOnjN0yepfocERGLEJgdN5M39WQn9VQ== 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 4ZxbjJ2dwBzn6d; Tue, 13 May 2025 12:42:44 +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 54DCgiHO072729; Tue, 13 May 2025 12:42:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DCgiZu072726; Tue, 13 May 2025 12:42:44 GMT (envelope-from git) Date: Tue, 13 May 2025 12:42:44 GMT Message-Id: <202505131242.54DCgiZu072726@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: f7fa53cead2e - releng/14.3 - stress2: exlock2.sh: Fix impact of previous '-U' removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: f7fa53cead2ee93a4f688537375e0f794533db36 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f7fa53cead2ee93a4f688537375e0f794533db36 commit f7fa53cead2ee93a4f688537375e0f794533db36 Author: Olivier Certner AuthorDate: 2025-05-12 08:34:05 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 12:41:33 +0000 stress2: exlock2.sh: Fix impact of previous '-U' removal In commit "stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change" (1265d3b07eaa), I forgot that '-U' also has the side-effect of implying '-x' by default. Now that '-U' has been removed, make '-x' explicit. Fixes: 1265d3b07eaa ("stress2: exlock2.sh: Preserve behavior after ps(1)'s '-U' change") MFC after: 1 hour Sponsored by: The FreeBSD Foundation (cherry picked from commit f6e826891760a34ef69e1122da0ee378f7caf454) (cherry picked from commit da6b04cd404341d494e2c89e3058ccaea5ca8a79) Approved by: re (implicit) --- 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 292e60e8d9f6..a9cd886755f4 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 | grep -v grep | grep /tmp/exlock2 | "\ + system("ps -x | grep -v grep | grep /tmp/exlock2 | "\ "awk '{print $1}' | xargs procstat -f"); } #endif