diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-03-07 18:33:02 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-03-07 18:33:02 +1100 |
commit | a0f3ba71a01428fb468ee7a6bc2fed42436c83f8 (patch) | |
tree | 0301a89585d250084f3481f00d887f057c936f09 /regress/multiplex.sh | |
parent | b712fccc18b218e98bd6ef69c85308cd00a6e543 (diff) |
- dtucker@cvs.openbsd.org 2005/02/27 11:33:30
[multiplex.sh test-exec.sh sshd-log-wrapper.sh]
Add optional capability to log output from regress commands; ok markus@
Use with: make TEST_SSH_LOGFILE=/tmp/regress.log
Diffstat (limited to 'regress/multiplex.sh')
-rw-r--r-- | regress/multiplex.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index 15e518c86..e8cc1ac53 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.9 2004/11/07 00:32:41 djm Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.10 2005/02/27 11:33:30 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | CTL=$OBJ/ctl-sock | 4 | CTL=$OBJ/ctl-sock |
@@ -13,6 +13,7 @@ fi | |||
13 | 13 | ||
14 | DATA=/bin/ls${EXEEXT} | 14 | DATA=/bin/ls${EXEEXT} |
15 | COPY=$OBJ/ls.copy | 15 | COPY=$OBJ/ls.copy |
16 | LOG=$TEST_SSH_LOGFILE | ||
16 | 17 | ||
17 | start_sshd | 18 | start_sshd |
18 | 19 | ||
@@ -48,13 +49,13 @@ cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}" | |||
48 | rm -f ${COPY} | 49 | rm -f ${COPY} |
49 | trace "sftp transfer over multiplexed connection and check result" | 50 | trace "sftp transfer over multiplexed connection and check result" |
50 | echo "get ${DATA} ${COPY}" | \ | 51 | echo "get ${DATA} ${COPY}" | \ |
51 | ${SFTP} -S ${SSH} -oControlPath=$CTL otherhost >/dev/null 2>&1 | 52 | ${SFTP} -S ${SSH} -oControlPath=$CTL otherhost >$LOG 2>&1 |
52 | test -f ${COPY} || fail "sftp: failed copy ${DATA}" | 53 | test -f ${COPY} || fail "sftp: failed copy ${DATA}" |
53 | cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}" | 54 | cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}" |
54 | 55 | ||
55 | rm -f ${COPY} | 56 | rm -f ${COPY} |
56 | trace "scp transfer over multiplexed connection and check result" | 57 | trace "scp transfer over multiplexed connection and check result" |
57 | ${SCP} -S ${SSH} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1 | 58 | ${SCP} -S ${SSH} -oControlPath=$CTL otherhost:${DATA} ${COPY} >$LOG 2>&1 |
58 | test -f ${COPY} || fail "scp: failed copy ${DATA}" | 59 | test -f ${COPY} || fail "scp: failed copy ${DATA}" |
59 | cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" | 60 | cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" |
60 | 61 | ||