From: dtucker <dtucker>
Date: Sun, 29 Aug 2004 07:09:34 +0000 (+0000)
Subject:  - (dtucker) [regress/multiplex.sh] Skip test on platforms that do not
X-Git-Tag: V_4_0_P1~185
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/3b4e535da9adce5d11e7ade15cfa0aa73ecb2216?hp=765a24cd50bf7600519af3ecdb618c8b9352a54d

 - (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 2c2329cb..a073fc23 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
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