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, 7 insertions, 10 deletions

diff --git a/regress/broken-pipe.sh b/regress/broken-pipe.sh
index a416f7a3b..c69276e27 100644
--- a/regress/broken-pipe.sh
+++ b/regress/broken-pipe.sh
@@ -1,15 +1,12 @@
-#       $OpenBSD: broken-pipe.sh,v 1.5 2015/03/03 22:35:19 markus Exp $
+#       $OpenBSD: broken-pipe.sh,v 1.6 2017/04/30 23:34:55 djm Exp $
 #       Placed in the Public Domain.
 
 tid="broken pipe test"
 
-for p in ${SSH_PROTOCOLS}; do
-        trace "protocol $p"
-        for i in 1 2 3 4; do
-                ${SSH} -$p -F $OBJ/ssh_config_config nexthost echo $i 2> /dev/null | true
-                r=$?
-                if [ $r -ne 0 ]; then
-                        fail "broken pipe returns $r for protocol $p"
-                fi
-        done
+for i in 1 2 3 4; do
+        ${SSH} -F $OBJ/ssh_config_config nexthost echo $i 2> /dev/null | true
+        r=$?
+        if [ $r -ne 0 ]; then
+                fail "broken pipe returns $r"
+        fi
 done