diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | regress/multiplex.sh | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -25,6 +25,8 @@ | |||
25 | ok markus@ | 25 | ok markus@ |
26 | - (dtucker) [configure.ac] Include sys/stream.h in sys/ptms.h header check, | 26 | - (dtucker) [configure.ac] Include sys/stream.h in sys/ptms.h header check, |
27 | fixes configure warning on Solaris reported by wknox at mitre.org. | 27 | fixes configure warning on Solaris reported by wknox at mitre.org. |
28 | - (dtucker) [regress/multiplex.sh] Skip test on platforms that do not | ||
29 | support FD passing since multiplex requires it. Noted by tim@ | ||
28 | 30 | ||
29 | 20040828 | 31 | 20040828 |
30 | - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from | 32 | - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from |
@@ -1692,4 +1694,4 @@ | |||
1692 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1694 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1693 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1695 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1694 | 1696 | ||
1695 | $Id: ChangeLog,v 1.3529 2004/08/29 07:04:50 dtucker Exp $ | 1697 | $Id: ChangeLog,v 1.3530 2004/08/29 07:09:34 dtucker Exp $ |
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index dbf2025be..c0adf109f 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -5,6 +5,12 @@ CTL=$OBJ/ctl-sock | |||
5 | 5 | ||
6 | tid="connection multiplexing" | 6 | tid="connection multiplexing" |
7 | 7 | ||
8 | if grep "#define.*DISABLE_FD_PASSING" ${BUILDDIR}/config.h >/dev/null 2>&1 | ||
9 | then | ||
10 | echo "skipped (not supported on this platform)" | ||
11 | exit 0 | ||
12 | fi | ||
13 | |||
8 | DATA=/bin/ls${EXEEXT} | 14 | DATA=/bin/ls${EXEEXT} |
9 | COPY=$OBJ/ls.copy | 15 | COPY=$OBJ/ls.copy |
10 | 16 | ||