summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2004-06-17 06:19:06 +0000
committerdtucker <dtucker@openbsd.org>2004-06-17 06:19:06 +0000
commit6cfe504b739dd6f795cbd075489f82cc28fa24a0 (patch)
treee24266d03700872b509e89fb1d01c739bb410d40
parentreset both irr's; put a barrier upon imr reset such that icr is reset properly and do it once (diff)
downloadwireguard-openbsd-6cfe504b739dd6f795cbd075489f82cc28fa24a0.tar.xz
wireguard-openbsd-6cfe504b739dd6f795cbd075489f82cc28fa24a0.zip
Add small description of failing test to failure message; ok djm@
-rw-r--r--regress/usr.bin/ssh/multiplex.sh18
1 files changed, 9 insertions, 9 deletions
diff --git a/regress/usr.bin/ssh/multiplex.sh b/regress/usr.bin/ssh/multiplex.sh
index 9fea117bd08..b70a99c01ce 100644
--- a/regress/usr.bin/ssh/multiplex.sh
+++ b/regress/usr.bin/ssh/multiplex.sh
@@ -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.
CTL=$OBJ/ctl-sock
@@ -16,27 +16,27 @@ ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
rm -f ${COPY}
trace "ssh transfer over multiplexed connection and check result"
${SSH} -S$CTL otherhost cat ${DATA} > ${COPY}
-test -f ${COPY} || fail "failed copy ${DATA}"
-cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
+test -f ${COPY} || fail "ssh -Sctl: failed copy ${DATA}"
+cmp ${DATA} ${COPY} || fail "ssh -Sctl: corrupted copy of ${DATA}"
rm -f ${COPY}
trace "ssh transfer over multiplexed connection and check result"
${SSH} -S $CTL otherhost cat ${DATA} > ${COPY}
-test -f ${COPY} || fail "failed copy ${DATA}"
-cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
+test -f ${COPY} || fail "ssh -S ctl: failed copy ${DATA}"
+cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}"
rm -f ${COPY}
trace "sftp transfer over multiplexed connection and check result"
echo "get ${DATA} ${COPY}" | \
${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1
-test -f ${COPY} || fail "failed copy ${DATA}"
-cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
+test -f ${COPY} || fail "sftp: failed copy ${DATA}"
+cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}"
rm -f ${COPY}
trace "scp transfer over multiplexed connection and check result"
${SCP} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1
-test -f ${COPY} || fail "failed copy ${DATA}"
-cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
+test -f ${COPY} || fail "scp: failed copy ${DATA}"
+cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}"
rm -f ${COPY}