From 2a81adc35c51668374b40661e1a0eaac8e53ef74 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 29 Aug 2004 17:09:34 +1000 Subject: - (dtucker) [regress/multiplex.sh] Skip test on platforms that do not support FD passing since multiplex requires it. Noted by tim@ --- ChangeLog | 4 +++- regress/multiplex.sh | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7ea4cb2d8..095571810 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 dbf2025be..c0adf109f 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 -- cgit v1.2.3