diff options
| author | Damien Miller <djm@mindrot.org> | 2014-08-01 12:26:49 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-08-01 12:26:49 +1000 |
| commit | a9c46746d266f8a1b092a72b2150682d1af8ebfc (patch) | |
| tree | 354709def3aa8eb2f85c4e5ec86db64418d9be01 | |
| parent | 426117b2e965e43f47015942b5be8dd88fe74b88 (diff) | |
| download | openssh-git-a9c46746d266f8a1b092a72b2150682d1af8ebfc.tar.gz | |
- (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need
a better solution, but this will have to do for now.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | regress/multiplex.sh | 12 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,7 @@ +20130801 + - (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need + a better solution, but this will have to do for now. + 20140730 - OpenBSD CVS Sync - millert@cvs.openbsd.org 2014/07/24 22:57:10 diff --git a/regress/multiplex.sh b/regress/multiplex.sh index 693211bf..377281a0 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh @@ -8,11 +8,15 @@ tid="connection multiplexing" if have_prog nc ; then if nc -h 2>&1 | grep -- -N >/dev/null; then NC="nc -N"; - else + elif nc -h 2>&1 | grep -- "-U.*Use UNIX" >/dev/null ; then NC="nc" - fi -else - echo "skipped (no nc found)" + else + echo "nc is incompatible" + fi +fi + +if test -z "$NC" ; then + echo "skipped (no compatible nc found)" exit 0 fi |