X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest030-relay;h=72594760d832b673cf7180dc1ff25ab9bf937a90;hb=a5765f1785653cabe18419e710c5b2bf7723b892;hp=088f059d4658101c5e9d589181a3094a5caae3cf;hpb=acbb5cf689a4336af05c9f259d909d8141055bac;p=openldap

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index 088f059d46..72594760d8 100755
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2006 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -73,6 +73,10 @@ fi
 echo "Testing virtual naming context mapping with $RELAYS backend(s)..."
 echo ""
 
+tmpfile=savelog.log
+if test -f $tmpfile ; then
+	rm -f $tmpfile
+fi
 first=1
 for RELAY in $RELAYS ; do
 	RUNIT=yes
@@ -89,19 +93,26 @@ for RELAY in $RELAYS ; do
 		if test $first = 1 ; then
 			first=0
 		else
-			echo ">>>>> waiting 10 seconds for things to exit"
-			sleep 10
+			echo ">>>>> waiting for things to exit"
+			test $KILLSERVERS != no && wait
 			echo ""
-	
+
+			mv -f $LOG1 $tmpfile
 			rm -rf $TESTDIR
 		fi
 
 		mkdir -p $TESTDIR $DBDIR1
+
+		if test -f $tmpfile ; then
+			mv $tmpfile $LOG1
+		fi
 	
 		. $SRCDIR/scripts/relay
 	fi
 done
 
 echo ">>>>> Test succeeded"
-exit 0
 
+test $KILLSERVERS != no && wait
+
+exit 0