From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Sun, 20 Feb 2022 03:47:26 +0000 (+0000)
Subject: upstream: Aproximate realpath on the expected output by deduping
X-Git-Tag: V_8_9_P1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbd772570a25436a33924d91c164d2b24021f010;p=thirdparty%2Fopenssh-portable.git

upstream: Aproximate realpath on the expected output by deduping

leading slashes. Fixes test failure when user's home dir is / which is
possible in some portable configurations.

OpenBSD-Regress-ID: 53b8c53734f8893806961475c7106397f98d9f63
---

diff --git a/regress/percent.sh b/regress/percent.sh
index 7ed41845b..bb81779a0 100644
--- a/regress/percent.sh
+++ b/regress/percent.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: percent.sh,v 1.13 2021/07/25 12:13:03 dtucker Exp $
+#	$OpenBSD: percent.sh,v 1.14 2022/02/20 03:47:26 dtucker Exp $
 #	Placed in the Public Domain.
 
 tid="percent expansions"
@@ -21,7 +21,8 @@ echo "permitlocalcommand yes" >> $OBJ/ssh_proxy
 
 trial()
 {
-	opt="$1"; arg="$2"; expect="$3"
+	opt="$1"; arg="$2"
+	expect=`echo "$3" | sed 's|^//|/|'` # approximate realpath
 
 	trace "test $opt=$arg $expect"
 	rm -f $OBJ/actual