upstream commit

eliminate explicit specification of protocol in tests and
loops over protocol. We only support SSHv2 now.

Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd

1 files changed, 6 insertions, 8 deletions

diff --git a/regress/stderr-data.sh b/regress/stderr-data.sh
index 8c8149a73..0ceb72b3a 100644
--- a/regress/stderr-data.sh
+++ b/regress/stderr-data.sh
@@ -1,13 +1,12 @@
-#       $OpenBSD: stderr-data.sh,v 1.4 2015/03/03 22:35:19 markus Exp $
+#       $OpenBSD: stderr-data.sh,v 1.5 2017/04/30 23:34:55 djm Exp $
 #       Placed in the Public Domain.
 
 tid="stderr data transfer"
 
 for n in '' -n; do
-for p in ${SSH_PROTOCOLS}; do
-        verbose "test $tid: proto $p ($n)"
-        ${SSH} $n -$p -F $OBJ/ssh_proxy otherhost \
-                exec sh -c \'"exec > /dev/null; sleep 3; cat ${DATA} 1>&2 $s"\' \
+        verbose "test $tid: ($n)"
+        ${SSH} $n -F $OBJ/ssh_proxy otherhost exec \
+            sh -c \'"exec > /dev/null; sleep 3; cat ${DATA} 1>&2 $s"\' \
                 2> ${COPY}
         r=$?
         if [ $r -ne 0 ]; then
@@ -16,8 +15,8 @@ for p in ${SSH_PROTOCOLS}; do
         cmp ${DATA} ${COPY}     || fail "stderr corrupt"
         rm -f ${COPY}
 
-        ${SSH} $n -$p -F $OBJ/ssh_proxy otherhost \
-                exec sh -c \'"echo a; exec > /dev/null; sleep 3; cat ${DATA} 1>&2 $s"\' \
+        ${SSH} $n -F $OBJ/ssh_proxy otherhost exec \
+            sh -c \'"echo a; exec > /dev/null; sleep 3; cat ${DATA} 1>&2 $s"\' \
                 > /dev/null 2> ${COPY}
         r=$?
         if [ $r -ne 0 ]; then
@@ -26,4 +25,3 @@ for p in ${SSH_PROTOCOLS}; do
         cmp ${DATA} ${COPY}     || fail "stderr corrupt"
         rm -f ${COPY}
 done
-done