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, 3 insertions, 4 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index b94cdf02f..93e15088f 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multiplex.sh,v 1.12 2009/05/05 07:51:36 dtucker Exp $ 1# $OpenBSD: multiplex.sh,v 1.13 2012/06/01 00:47:36 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4CTL=/tmp/openssh.regress.ctl-sock.$$ 4CTL=/tmp/openssh.regress.ctl-sock.$$
@@ -12,7 +12,6 @@ fi
12 12
13DATA=/bin/ls${EXEEXT} 13DATA=/bin/ls${EXEEXT}
14COPY=$OBJ/ls.copy 14COPY=$OBJ/ls.copy
15LOG=$TEST_SSH_LOGFILE
16 15
17start_sshd 16start_sshd
18 17
@@ -48,13 +47,13 @@ cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}"
48rm -f ${COPY} 47rm -f ${COPY}
49trace "sftp transfer over multiplexed connection and check result" 48trace "sftp transfer over multiplexed connection and check result"
50echo "get ${DATA} ${COPY}" | \ 49echo "get ${DATA} ${COPY}" | \
51 ${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >$LOG 2>&1 50 ${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >>$TEST_SSH_LOGFILE 2>&1
52test -f ${COPY} || fail "sftp: failed copy ${DATA}" 51test -f ${COPY} || fail "sftp: failed copy ${DATA}"
53cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}" 52cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}"
54 53
55rm -f ${COPY} 54rm -f ${COPY}
56trace "scp transfer over multiplexed connection and check result" 55trace "scp transfer over multiplexed connection and check result"
57${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >$LOG 2>&1 56${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >>$TEST_SSH_LOGFILE 2>&1
58test -f ${COPY} || fail "scp: failed copy ${DATA}" 57test -f ${COPY} || fail "scp: failed copy ${DATA}"
59cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" 58cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}"
60 59