tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2004/06/17 06:19:06 

[regress/multiplex.sh]
     Add small description of failing test to failure message; ok djm@
This commit is contained in:
Darren Tucker 2004-06-17 16:34:02 +10:00
parent ffaa6a5f01
commit 3e86fc4e99
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -9,6 +9,9 @@
- dtucker@cvs.openbsd.org 2004/06/17 06:00:05 - dtucker@cvs.openbsd.org 2004/06/17 06:00:05
[regress/multiplex.sh] [regress/multiplex.sh]
Use DATA and COPY for test data rather than hard-coded paths; ok djm@ Use DATA and COPY for test data rather than hard-coded paths; ok djm@
- dtucker@cvs.openbsd.org 2004/06/17 06:19:06
[regress/multiplex.sh]
Add small description of failing test to failure message; ok djm@
20040616 20040616
- (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
@ -1263,4 +1266,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3401 2004/06/17 06:32:45 dtucker Exp $ $Id: ChangeLog,v 1.3402 2004/06/17 06:34:02 dtucker Exp $

18
regress/multiplex.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: multiplex.sh,v 1.4 2004/06/17 06:00:05 dtucker Exp $ # $OpenBSD: multiplex.sh,v 1.5 2004/06/17 06:19:06 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
CTL=$OBJ/ctl-sock CTL=$OBJ/ctl-sock
@ -16,27 +16,27 @@ ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
rm -f ${COPY} rm -f ${COPY}
trace "ssh transfer over multiplexed connection and check result" trace "ssh transfer over multiplexed connection and check result"
${SSH} -S$CTL otherhost cat ${DATA} > ${COPY} ${SSH} -S$CTL otherhost cat ${DATA} > ${COPY}
test -f ${COPY} || fail "failed copy ${DATA}" test -f ${COPY} || fail "ssh -Sctl: failed copy ${DATA}"
cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" cmp ${DATA} ${COPY} || fail "ssh -Sctl: corrupted copy of ${DATA}"
rm -f ${COPY} rm -f ${COPY}
trace "ssh transfer over multiplexed connection and check result" trace "ssh transfer over multiplexed connection and check result"
${SSH} -S $CTL otherhost cat ${DATA} > ${COPY} ${SSH} -S $CTL otherhost cat ${DATA} > ${COPY}
test -f ${COPY} || fail "failed copy ${DATA}" test -f ${COPY} || fail "ssh -S ctl: failed copy ${DATA}"
cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}"
rm -f ${COPY} rm -f ${COPY}
trace "sftp transfer over multiplexed connection and check result" trace "sftp transfer over multiplexed connection and check result"
echo "get ${DATA} ${COPY}" | \ echo "get ${DATA} ${COPY}" | \
${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1 ${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1
test -f ${COPY} || fail "failed copy ${DATA}" test -f ${COPY} || fail "sftp: failed copy ${DATA}"
cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}"
rm -f ${COPY} rm -f ${COPY}
trace "scp transfer over multiplexed connection and check result" trace "scp transfer over multiplexed connection and check result"
${SCP} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1 ${SCP} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1
test -f ${COPY} || fail "failed copy ${DATA}" test -f ${COPY} || fail "scp: failed copy ${DATA}"
cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}"
rm -f ${COPY} rm -f ${COPY}