summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--regress/multiplex.sh4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d40c3193..43f0e7d7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
use it to kill the mux master started in multiplex.sh (it was being left
around on fatal failures)
+ - djm@cvs.openbsd.org 2014/07/07 08:15:26
+ [multiplex.sh]
+ remove forced-fatal that I stuck in there to test the new cleanup
+ logic and forgot to remove...
20140706
- OpenBSD CVS Sync
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index bc286b5e9..0a9ed2fbf 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: multiplex.sh,v 1.22 2014/07/06 07:42:03 djm Exp $
+# $OpenBSD: multiplex.sh,v 1.23 2014/07/07 08:15:26 djm Exp $
# Placed in the Public Domain.
CTL=/tmp/openssh.regress.ctl-sock.$$
@@ -45,8 +45,6 @@ if [ $? -ne 0 ]; then
fail "environment not found"
fi
-fatal ok
-
verbose "test $tid: transfer"
rm -f ${COPY}
trace "ssh transfer over multiplexed connection and check result"