summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--regress/multiplex.sh18
2 files changed, 13 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index b6617d7ee..39f4e45d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 - dtucker@cvs.openbsd.org 2004/06/17 06:00:05 9 - dtucker@cvs.openbsd.org 2004/06/17 06:00:05
10 [regress/multiplex.sh] 10 [regress/multiplex.sh]
11 Use DATA and COPY for test data rather than hard-coded paths; ok djm@ 11 Use DATA and COPY for test data rather than hard-coded paths; ok djm@
12 - dtucker@cvs.openbsd.org 2004/06/17 06:19:06
13 [regress/multiplex.sh]
14 Add small description of failing test to failure message; ok djm@
12 15
1320040616 1620040616
14 - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No 17 - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
@@ -1263,4 +1266,4 @@
1263 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1266 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1264 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1267 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1265 1268
1266$Id: ChangeLog,v 1.3401 2004/06/17 06:32:45 dtucker Exp $ 1269$Id: ChangeLog,v 1.3402 2004/06/17 06:34:02 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 9fea117bd..b70a99c01 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multiplex.sh,v 1.4 2004/06/17 06:00:05 dtucker Exp $ 1# $OpenBSD: multiplex.sh,v 1.5 2004/06/17 06:19:06 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4CTL=$OBJ/ctl-sock 4CTL=$OBJ/ctl-sock
@@ -16,27 +16,27 @@ ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
16rm -f ${COPY} 16rm -f ${COPY}
17trace "ssh transfer over multiplexed connection and check result" 17trace "ssh transfer over multiplexed connection and check result"
18${SSH} -S$CTL otherhost cat ${DATA} > ${COPY} 18${SSH} -S$CTL otherhost cat ${DATA} > ${COPY}
19test -f ${COPY} || fail "failed copy ${DATA}" 19test -f ${COPY} || fail "ssh -Sctl: failed copy ${DATA}"
20cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" 20cmp ${DATA} ${COPY} || fail "ssh -Sctl: corrupted copy of ${DATA}"
21 21
22rm -f ${COPY} 22rm -f ${COPY}
23trace "ssh transfer over multiplexed connection and check result" 23trace "ssh transfer over multiplexed connection and check result"
24${SSH} -S $CTL otherhost cat ${DATA} > ${COPY} 24${SSH} -S $CTL otherhost cat ${DATA} > ${COPY}
25test -f ${COPY} || fail "failed copy ${DATA}" 25test -f ${COPY} || fail "ssh -S ctl: failed copy ${DATA}"
26cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" 26cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}"
27 27
28rm -f ${COPY} 28rm -f ${COPY}
29trace "sftp transfer over multiplexed connection and check result" 29trace "sftp transfer over multiplexed connection and check result"
30echo "get ${DATA} ${COPY}" | \ 30echo "get ${DATA} ${COPY}" | \
31 ${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1 31 ${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1
32test -f ${COPY} || fail "failed copy ${DATA}" 32test -f ${COPY} || fail "sftp: failed copy ${DATA}"
33cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" 33cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}"
34 34
35rm -f ${COPY} 35rm -f ${COPY}
36trace "scp transfer over multiplexed connection and check result" 36trace "scp transfer over multiplexed connection and check result"
37${SCP} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1 37${SCP} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1
38test -f ${COPY} || fail "failed copy ${DATA}" 38test -f ${COPY} || fail "scp: failed copy ${DATA}"
39cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" 39cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}"
40 40
41rm -f ${COPY} 41rm -f ${COPY}
42 42