summaryrefslogtreecommitdiff
path: root/regress/multiplex.sh
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-02-21 11:57:14 +0000
committerColin Watson <cjwatson@debian.org>2020-02-21 14:27:02 +0000
commit886e47e745586c34e81cfd5c5fb9b5dbc8e84d04 (patch)
treedd6c3b4dc64a17c520af7aaf213163f8a0a63e56 /regress/multiplex.sh
parentac2b4c0697fcac554041ab95f81736887eadf6ec (diff)
parenta2dabf35ce0228c86a288d11cc847a9d9801604f (diff)
New upstream release (8.2p1)
Diffstat (limited to 'regress/multiplex.sh')
-rw-r--r--regress/multiplex.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index b5e604dba..817ddbfa8 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multiplex.sh,v 1.30 2019/07/05 04:03:13 dtucker Exp $ 1# $OpenBSD: multiplex.sh,v 1.32 2020/01/25 02:57:53 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4make_tmpdir 4make_tmpdir
@@ -6,8 +6,6 @@ CTL=${SSH_REGRESS_TMP}/ctl-sock
6 6
7tid="connection multiplexing" 7tid="connection multiplexing"
8 8
9NC=$OBJ/netcat
10
11trace "will use ProxyCommand $proxycmd" 9trace "will use ProxyCommand $proxycmd"
12if config_defined DISABLE_FD_PASSING ; then 10if config_defined DISABLE_FD_PASSING ; then
13 echo "skipped (not supported on this platform)" 11 echo "skipped (not supported on this platform)"
@@ -18,7 +16,7 @@ P=3301 # test port
18 16
19wait_for_mux_master_ready() 17wait_for_mux_master_ready()
20{ 18{
21 for i in 1 2 3 4 5; do 19 for i in 1 2 3 4 5 6 7 8 9; do
22 ${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost \ 20 ${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost \
23 >/dev/null 2>&1 && return 0 21 >/dev/null 2>&1 && return 0
24 sleep $i 22 sleep $i