- djm@cvs.openbsd.org 2012/06/01 00:47:35

     [multiplex.sh forwarding.sh]
     append to rather than truncate test log; bz#2013 from openssh AT
     roumenpetrov.

diff --git a/ChangeLog b/ChangeLog
index 970c35c95232d2f035bbe0c7f254ca99f56c8c7b..f6c39be205b92596f1e1a09834437bd42be80bbd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,10 @@
      [regress/addrmatch.sh]
      Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests
      to match.  Feedback and ok djm@ markus@.
+   - djm@cvs.openbsd.org 2012/06/01 00:47:35
+     [multiplex.sh forwarding.sh]
+     append to rather than truncate test log; bz#2013 from openssh AT
+     roumenpetrov.info
 
 20120628
  - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null

diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 6dec991a60e2e0edef68c7e4e1686b6b04eeafed..f9c367beb8a6f26ce5c5b7e73a52c59658bf5648 100644 (file)
--- a/regress/forwarding.sh
+++ b/regress/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"
@@ -75,7 +75,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
@@ -88,7 +88,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/multiplex.sh b/regress/multiplex.sh
index b94cdf02f785d5624add82c309049c2739a84809..93e15088f4bac4ebcfdc46df44356d24d818d479 100644 (file)
--- a/regress/multiplex.sh
+++ b/regress/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=/tmp/openssh.regress.ctl-sock.$$
@@ -12,7 +12,6 @@ fi
 
 DATA=/bin/ls${EXEEXT}
 COPY=$OBJ/ls.copy
-LOG=$TEST_SSH_LOGFILE
 
 start_sshd
 
@@ -48,13 +47,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}"