Sync with HEAD

[openldap] / tests / scripts / test030-relay

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index 8ab4b6076f02c94bcec387eceddffe25914b61e1..7f06f98e7f4ff74283a343846afef72b45adb90b 100755 (executable)
--- 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-2005 The OpenLDAP Foundation.
+## Copyright 1998-2006 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -89,8 +89,8 @@ 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 ""
        
                        rm -rf $TESTDIR
@@ -103,5 +103,7 @@ for RELAY in $RELAYS ; do
 done
 
 echo ">>>>> Test succeeded"
-exit 0
 
+test $KILLSERVERS != no && wait
+
+exit 0