summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2012-06-30 15:03:28 +1000
committerDarren Tucker <dtucker@zip.com.au>2012-06-30 15:03:28 +1000
commit4430a86c14dc0e043f8938b39bf389af1200f937 (patch)
tree564c14d3d26b1b0c769759428116c50181b8cf7f
parent301390316cf73fc50d769691ed7f95c21ea6646a (diff)
- 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.
-rw-r--r--ChangeLog4
-rw-r--r--regress/forwarding.sh6
-rw-r--r--regress/multiplex.sh7
3 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 970c35c95..f6c39be20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,10 @@
27 [regress/addrmatch.sh] 27 [regress/addrmatch.sh]
28 Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests 28 Add "Match LocalAddress" and "Match LocalPort" to sshd and adjust tests
29 to match. Feedback and ok djm@ markus@. 29 to match. Feedback and ok djm@ markus@.
30 - djm@cvs.openbsd.org 2012/06/01 00:47:35
31 [multiplex.sh forwarding.sh]
32 append to rather than truncate test log; bz#2013 from openssh AT
33 roumenpetrov.info
30 34
3120120628 3520120628
32 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null 36 - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 6dec991a6..f9c367beb 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: forwarding.sh,v 1.7 2010/01/11 02:53:44 dtucker Exp $ 1# $OpenBSD: forwarding.sh,v 1.8 2012/06/01 00:47:35 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="local and remote forwarding" 4tid="local and remote forwarding"
@@ -75,7 +75,7 @@ for p in 1 2; do
75 else 75 else
76 # this one should fail 76 # this one should fail
77 ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \ 77 ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
78 2>${TEST_SSH_LOGFILE} && \ 78 2>>$TEST_SSH_LOGFILE && \
79 fail "local forwarding not cleared" 79 fail "local forwarding not cleared"
80 fi 80 fi
81 sleep 10 81 sleep 10
@@ -88,7 +88,7 @@ for p in 1 2; do
88 else 88 else
89 # this one should fail 89 # this one should fail
90 ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \ 90 ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
91 2>${TEST_SSH_LOGFILE} && \ 91 2>>$TEST_SSH_LOGFILE && \
92 fail "remote forwarding not cleared" 92 fail "remote forwarding not cleared"
93 fi 93 fi
94 sleep 10 94 sleep 10
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index b94cdf02f..93e15088f 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multiplex.sh,v 1.12 2009/05/05 07:51:36 dtucker Exp $ 1# $OpenBSD: multiplex.sh,v 1.13 2012/06/01 00:47:36 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4CTL=/tmp/openssh.regress.ctl-sock.$$ 4CTL=/tmp/openssh.regress.ctl-sock.$$
@@ -12,7 +12,6 @@ fi
12 12
13DATA=/bin/ls${EXEEXT} 13DATA=/bin/ls${EXEEXT}
14COPY=$OBJ/ls.copy 14COPY=$OBJ/ls.copy
15LOG=$TEST_SSH_LOGFILE
16 15
17start_sshd 16start_sshd
18 17
@@ -48,13 +47,13 @@ cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}"
48rm -f ${COPY} 47rm -f ${COPY}
49trace "sftp transfer over multiplexed connection and check result" 48trace "sftp transfer over multiplexed connection and check result"
50echo "get ${DATA} ${COPY}" | \ 49echo "get ${DATA} ${COPY}" | \
51 ${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >$LOG 2>&1 50 ${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >>$TEST_SSH_LOGFILE 2>&1
52test -f ${COPY} || fail "sftp: failed copy ${DATA}" 51test -f ${COPY} || fail "sftp: failed copy ${DATA}"
53cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}" 52cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}"
54 53
55rm -f ${COPY} 54rm -f ${COPY}
56trace "scp transfer over multiplexed connection and check result" 55trace "scp transfer over multiplexed connection and check result"
57${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >$LOG 2>&1 56${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >>$TEST_SSH_LOGFILE 2>&1
58test -f ${COPY} || fail "scp: failed copy ${DATA}" 57test -f ${COPY} || fail "scp: failed copy ${DATA}"
59cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" 58cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}"
60 59