diff options
Diffstat (limited to 'regress')
-rw-r--r-- | regress/forwarding.sh | 6 | ||||
-rw-r--r-- | regress/multiplex.sh | 7 |
2 files changed, 6 insertions, 7 deletions
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 | ||
4 | tid="local and remote forwarding" | 4 | tid="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 | ||
4 | CTL=/tmp/openssh.regress.ctl-sock.$$ | 4 | CTL=/tmp/openssh.regress.ctl-sock.$$ |
@@ -12,7 +12,6 @@ fi | |||
12 | 12 | ||
13 | DATA=/bin/ls${EXEEXT} | 13 | DATA=/bin/ls${EXEEXT} |
14 | COPY=$OBJ/ls.copy | 14 | COPY=$OBJ/ls.copy |
15 | LOG=$TEST_SSH_LOGFILE | ||
16 | 15 | ||
17 | start_sshd | 16 | start_sshd |
18 | 17 | ||
@@ -48,13 +47,13 @@ cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}" | |||
48 | rm -f ${COPY} | 47 | rm -f ${COPY} |
49 | trace "sftp transfer over multiplexed connection and check result" | 48 | trace "sftp transfer over multiplexed connection and check result" |
50 | echo "get ${DATA} ${COPY}" | \ | 49 | echo "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 |
52 | test -f ${COPY} || fail "sftp: failed copy ${DATA}" | 51 | test -f ${COPY} || fail "sftp: failed copy ${DATA}" |
53 | cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}" | 52 | cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}" |
54 | 53 | ||
55 | rm -f ${COPY} | 54 | rm -f ${COPY} |
56 | trace "scp transfer over multiplexed connection and check result" | 55 | trace "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 |
58 | test -f ${COPY} || fail "scp: failed copy ${DATA}" | 57 | test -f ${COPY} || fail "scp: failed copy ${DATA}" |
59 | cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" | 58 | cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" |
60 | 59 | ||