From nobody Tue May 13 09:27:04 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 4ZxWMY2DV5z5wbYt; Tue, 13 May 2025 09:27:05 +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 4ZxWMX5slRz3l6Q; Tue, 13 May 2025 09:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747128424; 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=yPUnEeTPhACeipYNbM58QAluF1IACGE2umPh/mSOxlo=; b=oNYDoBA16wLKjO1b83VNd61zchRS8bx+jJdSy/35n7Ph9DJtg4owhswDhIV/Q4pdxSHGKC St3KHczcYK/lXeezPlT2KbpEHg5uLyACdBASIyu4+k1ldZvX380PXO+r6Qtt4NHUUOXnAC Ego3YILBp462k8AnrkWTzFSZRooYnSrANhj+byb6I12g0av1f54Gqi47Q7R/4UEg7FL1Vg EP0XMwMXKY+yr9sBJBGi8vlE6mMK9GuZeK5yLeR1XZ89hVVBmlw/uvJ3x0ZxZIWFBv4Ipg MvipCsVrY9jfHcZqbtwnSVg3hExNDMVCf7GpU5WP0LeZOtB15KGNYR7jO+Bptw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747128424; 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=yPUnEeTPhACeipYNbM58QAluF1IACGE2umPh/mSOxlo=; b=rIbiSBpLIV6T3yD8egCP+T339ew3OFaz/ZkYgu+XDCdMV8bxq+qeM0ifxWxkt4J2k60O7y ncfU0UQ3e4uWqRb5BrJGXSZGS9tcpH2ky3hZINQMTvXSbYTh8bEScv7Vue926vXsoj1/Pw L6mvJIMSShATCzVOmIxAVZF2OVojz98JD6Qmv9+jNIX1Z4myddDl85gBxScvIuyU9rSEfb rx6/QYeDuCeRXPZEte+K+yXS5OflEZGn8MkIj+Eq/XGPvqZhwC1RQ+wxQxGYY7UHGOkoSd NKaQ4F34Dkoc8mYxP6ioEHAlqzvbMCFVs8r68YoEbVdQoXKnMtHhCNwe0f1mPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747128424; a=rsa-sha256; cv=none; b=lpf4gwO93HkqAi6ikM63LU2aY2FUou6EGvSdXL1fGG56RmKj0CgNoM90pjh8gjEgS49DDb cv3A14h5M9N+VKyzJcr4Y/YQbIiz7Izm1SQHmz+EO4Y3uFGw8ZGYnV1Nqt/bG2bStbZvQD n1TOEQfuw+y+VzuSx+akYX0TvXEKr5N0464VR3f61b3PxJy7dvfRmOu7rvcfw90kH8PHl3 0vsEG/bHauF9gZiSJe5zRgXB5uOo2v2btV1kA+egUE4t7dlxXXIup+a3JXjtazbJAkCBnh yDICQbDgi86W2OnEzj8r7kwitV2T63YkRHgSoBoebmnHfM5airVT8iS0G2YS+w== 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 4ZxWMX5KFDzgsh; Tue, 13 May 2025 09:27:04 +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 54D9R4PG097953; Tue, 13 May 2025 09:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54D9R46p097948; Tue, 13 May 2025 09:27:04 GMT (envelope-from git) Date: Tue, 13 May 2025 09:27:04 GMT Message-Id: <202505130927.54D9R46p097948@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: da6b04cd4043 - stable/14 - stress2: exlock2.sh: Fix impact of previous '-U' removal 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: da6b04cd404341d494e2c89e3058ccaea5ca8a79 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=da6b04cd404341d494e2c89e3058ccaea5ca8a79 commit da6b04cd404341d494e2c89e3058ccaea5ca8a79 Author: Olivier Certner AuthorDate: 2025-05-12 08:34:05 +0000 Commit: Olivier Certner CommitDate: 2025-05-13 09:26:52 +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) --- 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