summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-08-29 17:09:34 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-08-29 17:09:34 +1000
commit2a81adc35c51668374b40661e1a0eaac8e53ef74 (patch)
treec50e7557e835f16c119b9af7f7fefb7f588bdced
parent48d99d36bb427f6c43cfe8d8e7d8a457897dfd53 (diff)
- (dtucker) [regress/multiplex.sh] Skip test on platforms that do not
support FD passing since multiplex requires it. Noted by tim@
-rw-r--r--ChangeLog4
-rw-r--r--regress/multiplex.sh6
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ea4cb2d..09557181 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,8 @@
ok markus@
- (dtucker) [configure.ac] Include sys/stream.h in sys/ptms.h header check,
fixes configure warning on Solaris reported by wknox at mitre.org.
+ - (dtucker) [regress/multiplex.sh] Skip test on platforms that do not
+ support FD passing since multiplex requires it. Noted by tim@
20040828
- (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from
@@ -1692,4 +1694,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3529 2004/08/29 07:04:50 dtucker Exp $
+$Id: ChangeLog,v 1.3530 2004/08/29 07:09:34 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index dbf2025b..c0adf109 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -5,6 +5,12 @@ CTL=$OBJ/ctl-sock
tid="connection multiplexing"
+if grep "#define.*DISABLE_FD_PASSING" ${BUILDDIR}/config.h >/dev/null 2>&1
+then
+ echo "skipped (not supported on this platform)"
+ exit 0
+fi
+
DATA=/bin/ls${EXEEXT}
COPY=$OBJ/ls.copy