diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-05-01 01:34:55 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-01 03:59:42 +0200 |
| commit | dd369320d2435b630a5974ab270d686dcd92d024 (patch) | |
| tree | 97ae4bb34d835fbafad12180862195a9e9192d28 /regress/multiplex.sh | |
| parent | upstream commit (diff) | |
| download | openssh-dd369320d2435b630a5974ab270d686dcd92d024.tar.xz openssh-dd369320d2435b630a5974ab270d686dcd92d024.zip | |
upstream commit
eliminate explicit specification of protocol in tests and
loops over protocol. We only support SSHv2 now.
Upstream-Regress-ID: 0082838a9b8a382b7ee9cbf0c1b9db727784fadd
Diffstat (limited to 'regress/multiplex.sh')
| -rw-r--r-- | regress/multiplex.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index acb9234d9..078a53a88 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh @@ -1,4 +1,4 @@ -# $OpenBSD: multiplex.sh,v 1.27 2014/12/22 06:14:29 djm Exp $ +# $OpenBSD: multiplex.sh,v 1.28 2017/04/30 23:34:55 djm Exp $ # Placed in the Public Domain. CTL=/tmp/openssh.regress.ctl-sock.$$ @@ -101,7 +101,7 @@ for s in 0 1 4 5 44; do ${SSH} -F $OBJ/ssh_config -S $CTL otherhost exit $s r=$? if [ $r -ne $s ]; then - fail "exit code mismatch for protocol $p: $r != $s" + fail "exit code mismatch: $r != $s" fi # same with early close of stdout/err @@ -110,7 +110,7 @@ for s in 0 1 4 5 44; do exec sh -c \'"sleep 2; exec > /dev/null 2>&1; sleep 3; exit $s"\' r=$? if [ $r -ne $s ]; then - fail "exit code (with sleep) mismatch for protocol $p: $r != $s" + fail "exit code (with sleep) mismatch: $r != $s" fi done |