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

     [regress/multiplex.sh]
     Add small description of failing test to failure message; ok djm@

1 files changed, 9 insertions, 9 deletions

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 @@
-#       $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}