summaryrefslogtreecommitdiff
path: root/regress/multiplex.sh
diff options
context:
space:
mode:
Diffstat (limited to 'regress/multiplex.sh')
-rw-r--r--regress/multiplex.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 15e518c86..e8cc1ac53 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multiplex.sh,v 1.9 2004/11/07 00:32:41 djm Exp $ 1# $OpenBSD: multiplex.sh,v 1.10 2005/02/27 11:33:30 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4CTL=$OBJ/ctl-sock 4CTL=$OBJ/ctl-sock
@@ -13,6 +13,7 @@ fi
13 13
14DATA=/bin/ls${EXEEXT} 14DATA=/bin/ls${EXEEXT}
15COPY=$OBJ/ls.copy 15COPY=$OBJ/ls.copy
16LOG=$TEST_SSH_LOGFILE
16 17
17start_sshd 18start_sshd
18 19
@@ -48,13 +49,13 @@ cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}"
48rm -f ${COPY} 49rm -f ${COPY}
49trace "sftp transfer over multiplexed connection and check result" 50trace "sftp transfer over multiplexed connection and check result"
50echo "get ${DATA} ${COPY}" | \ 51echo "get ${DATA} ${COPY}" | \
51 ${SFTP} -S ${SSH} -oControlPath=$CTL otherhost >/dev/null 2>&1 52 ${SFTP} -S ${SSH} -oControlPath=$CTL otherhost >$LOG 2>&1
52test -f ${COPY} || fail "sftp: failed copy ${DATA}" 53test -f ${COPY} || fail "sftp: failed copy ${DATA}"
53cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}" 54cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}"
54 55
55rm -f ${COPY} 56rm -f ${COPY}
56trace "scp transfer over multiplexed connection and check result" 57trace "scp transfer over multiplexed connection and check result"
57${SCP} -S ${SSH} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1 58${SCP} -S ${SSH} -oControlPath=$CTL otherhost:${DATA} ${COPY} >$LOG 2>&1
58test -f ${COPY} || fail "scp: failed copy ${DATA}" 59test -f ${COPY} || fail "scp: failed copy ${DATA}"
59cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" 60cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}"
60 61