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, 13 insertions, 16 deletions

diff --git a/regress/transfer.sh b/regress/transfer.sh
index 36c14634a..cf174a006 100644
--- a/regress/transfer.sh
+++ b/regress/transfer.sh
@@ -1,26 +1,23 @@
-#       $OpenBSD: transfer.sh,v 1.3 2015/03/03 22:35:19 markus Exp $
+#       $OpenBSD: transfer.sh,v 1.4 2017/04/30 23:34:55 djm Exp $
 #       Placed in the Public Domain.
 
 tid="transfer data"
 
-for p in ${SSH_PROTOCOLS}; do
-        verbose "$tid: proto $p"
+rm -f ${COPY}
+${SSH} -n -q -F $OBJ/ssh_proxy somehost cat ${DATA} > ${COPY}
+if [ $? -ne 0 ]; then
+        fail "ssh cat $DATA failed"
+fi
+cmp ${DATA} ${COPY}             || fail "corrupted copy"
+
+for s in 10 100 1k 32k 64k 128k 256k; do
+        trace "dd-size ${s}"
         rm -f ${COPY}
-        ${SSH} -n -q -$p -F $OBJ/ssh_proxy somehost cat ${DATA} > ${COPY}
+        dd if=$DATA obs=${s} 2> /dev/null | \
+                ${SSH} -q -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
         if [ $? -ne 0 ]; then
                 fail "ssh cat $DATA failed"
         fi
-        cmp ${DATA} ${COPY}             || fail "corrupted copy"
-
-        for s in 10 100 1k 32k 64k 128k 256k; do
-                trace "proto $p dd-size ${s}"
-                rm -f ${COPY}
-                dd if=$DATA obs=${s} 2> /dev/null | \
-                        ${SSH} -q -$p -F $OBJ/ssh_proxy somehost "cat > ${COPY}"
-                if [ $? -ne 0 ]; then
-                        fail "ssh cat $DATA failed"
-                fi
-                cmp $DATA ${COPY}               || fail "corrupted copy"
-        done
+        cmp $DATA ${COPY}               || fail "corrupted copy"
 done
 rm -f ${COPY}