From 2d7964a03e1f50a48040ec6912c0a956df909d21 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@dtucker.net>
Date: Mon, 25 Mar 2024 14:05:40 +1100
Subject: Move xpg4 'id' handling into test-exec.sh.

Handle replacement of 'id' the same way as we do other Portable specific
replacements in test-exec.sh.  This brings percent.sh back into sync
with upstream.
---
 regress/percent.sh   | 5 -----
 regress/test-exec.sh | 8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/regress/percent.sh b/regress/percent.sh
index 44561d41..354854f9 100644
--- a/regress/percent.sh
+++ b/regress/percent.sh
@@ -3,11 +3,6 @@
 
 tid="percent expansions"
 
-if [ -x "/usr/xpg4/bin/id" ]; then
-	PATH=/usr/xpg4/bin:$PATH
-	export PATH
-fi
-
 USER=`id -u -n`
 USERID=`id -u`
 HOST=`hostname | cut -f1 -d.`
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index ad627941..f4c363d8 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -392,6 +392,7 @@ have_prog()
 jot() {
 	awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }"
 }
+
 if [ ! -x "`which rev`" ]; then
 rev()
 {
@@ -399,6 +400,13 @@ rev()
 }
 fi
 
+if [ -x "/usr/xpg4/bin/id" ]; then
+id()
+{
+	/usr/xpg4/bin/id
+}
+fi
+
 # Check whether preprocessor symbols are defined in config.h.
 config_defined ()
 {
-- 
cgit v1.2.3