From 7d06b00032d2d57474dbba9fddd0b8cd9ef05ef3 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 7 Jan 2011 09:54:20 +1100
Subject:    - djm@cvs.openbsd.org 2011/01/06 22:46:21      [regress/Makefile
 regress/host-expand.sh]      regress test for LocalCommand %n expansion from
 bert.wesarg AT      googlemail.com; ok markus@

---
 regress/host-expand.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 regress/host-expand.sh

(limited to 'regress/host-expand.sh')

diff --git a/regress/host-expand.sh b/regress/host-expand.sh
new file mode 100644
index 000000000..c0417d9c9
--- /dev/null
+++ b/regress/host-expand.sh
@@ -0,0 +1,18 @@
+#	Placed in the Public Domain.
+
+tid="expand %h and %n"
+
+echo 'PermitLocalCommand yes' >> $OBJ/ssh_proxy
+printf 'LocalCommand printf "%%%%s\\n" "%%n" "%%h"\n' >> $OBJ/ssh_proxy
+
+cat >expect <<EOE
+somehost
+127.0.0.1
+EOE
+
+for p in 1 2; do
+	verbose "test $tid: proto $p"
+	${SSH} -F $OBJ/ssh_proxy -$p somehost true >actual
+	diff expect actual || fail "$tid proto $p"
+done
+
-- 
cgit v1.2.3


From 076a3b9ced9bbf5ee4f17a84b9593cc074308e15 Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Mon, 10 Jan 2011 12:56:26 -0800
Subject:  - (tim) [regress/host-expand.sh] Fix for building outside of read
 only    source tree.

---
 ChangeLog              | 4 ++++
 regress/host-expand.sh | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'regress/host-expand.sh')

diff --git a/ChangeLog b/ChangeLog
index 6dde0e858..3e931f394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20110111
+ - (tim) [regress/host-expand.sh] Fix for building outside of read only
+   source tree.
+
 20110109
  - (djm) [Makefile.in] list ssh_host_ecdsa key in PATHSUBS; spotted by
    openssh AT roumenpetrov.info
diff --git a/regress/host-expand.sh b/regress/host-expand.sh
index c0417d9c9..a0188363d 100644
--- a/regress/host-expand.sh
+++ b/regress/host-expand.sh
@@ -5,14 +5,14 @@ tid="expand %h and %n"
 echo 'PermitLocalCommand yes' >> $OBJ/ssh_proxy
 printf 'LocalCommand printf "%%%%s\\n" "%%n" "%%h"\n' >> $OBJ/ssh_proxy
 
-cat >expect <<EOE
+cat >$OBJ/expect <<EOE
 somehost
 127.0.0.1
 EOE
 
 for p in 1 2; do
 	verbose "test $tid: proto $p"
-	${SSH} -F $OBJ/ssh_proxy -$p somehost true >actual
-	diff expect actual || fail "$tid proto $p"
+	${SSH} -F $OBJ/ssh_proxy -$p somehost true >$OBJ/actual
+	diff $OBJ/expect $OBJ/actual || fail "$tid proto $p"
 done
 
-- 
cgit v1.2.3