- (dtucker) [regress/multiplex.sh] Skip test on platforms that do not

   support FD passing since multiplex requires it.  Noted by tim@

diff --git a/ChangeLog b/ChangeLog
index 2c2329cb005dd61853585a493441294f123d2af0..a073fc23ad47726e9d3f82682323e2e2f67d1328 100644 (file)
--- 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

diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index dbf2025be9af36657869b600d176cef9ff865882..c0adf109fecaf1eff0d55b6f218281a222d58100 100644 (file)
--- 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