git: 6a6d6d7d9c29 - main - dtrace tests: Fix finding multiple process results

The branch main has been updated by bdrewery:

URL: https://cgit.FreeBSD.org/src/commit/?id=6a6d6d7d9c294efb8b4025d80e938f2c16c3aa5f

commit 6a6d6d7d9c294efb8b4025d80e938f2c16c3aa5f
Author:     Bryan Drewery <bdrewery@FreeBSD.org>
AuthorDate: 2026-07-03 00:37:02 +0000
Commit:     Bryan Drewery <bdrewery@FreeBSD.org>
CommitDate: 2026-07-06 19:40:23 +0000

    dtrace tests: Fix finding multiple process results
    
    When looking up self process we can use `ps -p $$` directly rather
    than grep which may find other processes ending in the expected PID.
    
    Sponsored by:   Dell Inc.
    Reviewed by:    markj, vangyzen
    Differential Revision: https://reviews.freebsd.org/D58019
---
 .../opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh       | 2 +-
 .../opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh       | 2 +-
 .../opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh        | 2 +-
 .../opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh        | 2 +-
 .../opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh
index 2397db6e1b72..bd4a2bf324b4 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh
@@ -77,7 +77,7 @@ fi
 
 #Get the groupid of the calling process using ps
 
-groupid=`ps -x -o pid,egid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+groupid=$(ps -p $$ -o egid= 2>/dev/null)
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get uid of the current process with pid = $$"
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh
index 5bdc391dbbc0..aa379b76025d 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh
@@ -69,7 +69,7 @@ EOF
 
 chmod 555 $dfilename
 
-userid=`ps -x -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+userid=$(ps -p $$ -o uid= 2>/dev/null)
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get uid of the current process with pid = $$"
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh
index 0c4e77b54e4f..00414f9bfe64 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh
@@ -69,7 +69,7 @@ EOF
 
 chmod 555 $dfilename
 
-groupid=`ps -x -o pid,gid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+groupid=$(ps -p $$ -o gid= 2>/dev/null)
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get uid of the current process with pid = $$"
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh
index 08a65b2d62dc..64fb817f1b34 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh
@@ -69,7 +69,7 @@ EOF
 
 chmod 555 $dfilename
 
-sessionid=`ps -x -o pid,sid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+sessionid=$(ps -p $$ -o sid= 2>/dev/null)
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get sid of the current process with pid = $$"
 	exit 1
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh
index 8cd6130ff644..a44186f5f28b 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh
@@ -69,7 +69,7 @@ EOF
 
 chmod 555 $dfilename
 
-userid=`ps -x -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+userid=$(ps -p $$ -o uid= 2>/dev/null)
 if [ $? -ne 0 ]; then
 	print -u2 "unable to get uid of the current process with pid = $$"
 	exit 1