diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2012-06-01 00:47:37 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2012-06-01 00:47:37 +0000 |
| commit | e43ae1c437e45f70b53d352b8e8974cb646bc833 (patch) | |
| tree | 7af293f91637537d2f365f4974fb5feac63e469c | |
| parent | 925f8c37c3f2bf635f5c3120e7b0e50689d1e669 (diff) | |
append to rather than truncate test log; bz#2013 from openssh AT
roumenpetrov.info
| -rw-r--r-- | regress/usr.bin/ssh/forwarding.sh | 6 | ||||
| -rw-r--r-- | regress/usr.bin/ssh/multiplex.sh | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/regress/usr.bin/ssh/forwarding.sh b/regress/usr.bin/ssh/forwarding.sh index adcd100f23b..242d7a986bb 100644 --- a/regress/usr.bin/ssh/forwarding.sh +++ b/regress/usr.bin/ssh/forwarding.sh @@ -1,4 +1,4 @@ -# $OpenBSD: forwarding.sh,v 1.7 2010/01/11 02:53:44 dtucker Exp $ +# $OpenBSD: forwarding.sh,v 1.8 2012/06/01 00:47:35 djm Exp $ # Placed in the Public Domain. tid="local and remote forwarding" @@ -74,7 +74,7 @@ for p in 1 2; do else # this one should fail ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \ - 2>${TEST_SSH_LOGFILE} && \ + 2>>$TEST_SSH_LOGFILE && \ fail "local forwarding not cleared" fi sleep 10 @@ -87,7 +87,7 @@ for p in 1 2; do else # this one should fail ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \ - 2>${TEST_SSH_LOGFILE} && \ + 2>>$TEST_SSH_LOGFILE && \ fail "remote forwarding not cleared" fi sleep 10 diff --git a/regress/usr.bin/ssh/multiplex.sh b/regress/usr.bin/ssh/multiplex.sh index 15e3074ccf7..44974fc26b5 100644 --- a/regress/usr.bin/ssh/multiplex.sh +++ b/regress/usr.bin/ssh/multiplex.sh @@ -1,4 +1,4 @@ -# $OpenBSD: multiplex.sh,v 1.12 2009/05/05 07:51:36 dtucker Exp $ +# $OpenBSD: multiplex.sh,v 1.13 2012/06/01 00:47:36 djm Exp $ # Placed in the Public Domain. CTL=$OBJ/ctl-sock @@ -7,7 +7,6 @@ tid="connection multiplexing" DATA=/bin/ls COPY=$OBJ/ls.copy -LOG=$TEST_SSH_LOGFILE start_sshd @@ -43,13 +42,13 @@ 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} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >$LOG 2>&1 + ${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >>$TEST_SSH_LOGFILE 2>&1 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} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >$LOG 2>&1 +${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >>$TEST_SSH_LOGFILE 2>&1 test -f ${COPY} || fail "scp: failed copy ${DATA}" cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" |