summaryrefslogtreecommitdiff
path: root/regress/forwarding.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-05-17 09:31:39 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-05-17 09:31:39 +1000
commitdfea3bcdd7c980c2335402464b7dd8d8721e426d (patch)
tree8a679275f462be86795ca1380e9838863f0ff2bd /regress/forwarding.sh
parent75129025a2d504b630d1718fef0da002f5662f63 (diff)
downloadopenssh-git-dfea3bcdd7c980c2335402464b7dd8d8721e426d.tar.gz
- dtucker@cvs.openbsd.org 2013/04/07 02:16:03
[regress/Makefile regress/rekey.sh regress/integrity.sh regress/sshd-log-wrapper.sh regress/forwarding.sh regress/test-exec.sh] use -E option for ssh and sshd to write debuging logs to ssh{,d}.log and save the output from any failing tests. If a test fails the debug output from ssh and sshd for the failing tests (and only the failing tests) should be available in failed-ssh{,d}.log.
Diffstat (limited to 'regress/forwarding.sh')
-rw-r--r--regress/forwarding.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index f9c367be..6a700307 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: forwarding.sh,v 1.8 2012/06/01 00:47:35 djm Exp $
+# $OpenBSD: forwarding.sh,v 1.9 2013/04/07 02:16:03 dtucker 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 && \
+ >>$TEST_REGRESS_LOGFILE 2>&1 && \
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 && \
+ >>$TEST_REGRESS_LOGFILE 2>&1 && \
fail "remote forwarding not cleared"
fi
sleep 10