From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 3 Jan 2006 18:04:12 +0000 (+0000)
Subject: fix ITS#4297 (there shouldn't be any more)
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~474
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e43eae8d36a267a5a804c8a9c982c72184f36054;p=openldap

fix ITS#4297 (there shouldn't be any more)
---

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index 4d8f50438d..8ab4b6076f 100755
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@@ -39,20 +39,28 @@ if test "x$RELAYS" = "x" ; then
 	if test $BACKLDAP = ldapno ; then 
 		echo "ldap backend not available, test skipped"
 	else
-		if test "x$RELAYS" != "x" ; then
-			RELAYS="${RELAYS} "
-		fi
-		RELAYS="${RELAYS}ldap"
+		if test $THREADS = "threadsno" ; then
+			echo "Need threads support, test skipped"
+		else
+			if test "x$RELAYS" != "x" ; then
+				RELAYS="${RELAYS} "
+			fi
+			RELAYS="${RELAYS}ldap"
+		fi 
 	fi
 
 	# back-meta
 	if test $BACKMETA = metano ; then 
 		echo "meta backend not available, test skipped"
 	else
-		if test "x$RELAYS" != "x" ; then
-			RELAYS="${RELAYS} "
+		if test $THREADS = "threadsno" ; then
+			echo "Need threads support, test skipped"
+		else
+			if test "x$RELAYS" != "x" ; then
+				RELAYS="${RELAYS} "
+			fi
+			RELAYS="${RELAYS}meta"
 		fi
-		RELAYS="${RELAYS}meta"
 	fi 
 fi
 
@@ -67,19 +75,31 @@ echo ""
 
 first=1
 for RELAY in $RELAYS ; do
-	if test $first = 1 ; then
-		first=0
-	else
-		echo ">>>>> waiting 10 seconds for things to exit"
-		sleep 10
-		echo ""
-
-		rm -rf $TESTDIR
+	RUNIT=yes
+	if test $THREADS = "threadsno" ; then
+		case $RELAY in
+		ldap|meta)
+			echo "Need threads support, test skipped"
+			RUNIT=no
+			;;
+		esac
 	fi
+	
+	if test $RUNIT = yes ; then		
+		if test $first = 1 ; then
+			first=0
+		else
+			echo ">>>>> waiting 10 seconds for things to exit"
+			sleep 10
+			echo ""
+	
+			rm -rf $TESTDIR
+		fi
 
-	mkdir -p $TESTDIR $DBDIR1
-
-	. $SRCDIR/scripts/relay
+		mkdir -p $TESTDIR $DBDIR1
+	
+		. $SRCDIR/scripts/relay
+	fi
 done
 
 echo ">>>>> Test succeeded"