Use shell "wait" instead of fixed 10 second wait-for-things-to-die

diff --git a/tests/scripts/all b/tests/scripts/all
index 111b55968500e09ecd3207bf4a33f9a0d6cbd38b..851c0d20c7d36912b1e28f959c36ee3166386dc8 100755 (executable)
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -38,7 +38,7 @@ for CMD in $SRCDIR/scripts/test*; do
                exit $RC
        fi
 
-       echo ">>>>> waiting $SLEEPTIME seconds for things to exit"
-       sleep $SLEEPTIME
+#      echo ">>>>> waiting $SLEEPTIME seconds for things to exit"
+#      sleep $SLEEPTIME
        echo ""
 done

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index cc97a1630fd98e67cc95c0583af324e63bf6a030..635b9fff6b8e80d23d4081312a62c600049422af 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -81,4 +81,6 @@ else
        fi
 fi
 
+test $KILLSERVERS != no && wait
+
 exit $RC

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 52a4f9df907b3a933fa533817d36800ff49507e8..3adf5e3fba4cf227160c051a96fca11ebeff6b36 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -72,4 +72,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 6be0c44413197dee135883d32197c47a57b3014f..cc7de3491c16d98f08b2cb246f8b73425dfc5ad7 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -77,4 +77,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index ef7f5674029f5c28f642b9fcbace3ef55d066d74..2da5130f49dade1f282355b8417469b843600a3f 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -145,4 +145,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index ab84f4b087bef7c05a1d9350709aee7a42e084ee..8e317b5c68ad269ec29c6e31f9be5e0cd9b8a764 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -228,4 +228,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 8395d40b8c648e7561b7435fae85661374bbb17b..57e6c93660c2110e62e01bee5d54c73b62436c29 100755 (executable)
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -236,4 +236,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index ea4d2749950d3ca76cb73f4bb320d59797db88be..23d0fbd5e6ffc012a6074b048e9c29e53614fee7 100755 (executable)
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -534,4 +534,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 41781e536fbf460ced6a0b7f29e30efb4e927c8f..85169e1f5541f8222c47ed7ee29cd2af71e3338a 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -197,8 +197,8 @@ echo "Stopping the slave..."
 kill -HUP $SLAVEPID
 KILLPIDS="$PID $SLURPPID"
 
-echo "Waiting 5 seconds for slave slapd to die..."
-sleep 5
+echo "Waiting for slave slapd to die..."
+wait $SLAVEPID
 
 echo "Applying more changes to the master slapd..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
@@ -223,8 +223,8 @@ echo "Stopping slurpd..."
 kill -HUP $SLURPPID
 KILLPIDS="$PID"
 
-echo "Waiting 5 seconds for slurpd to die..."
-sleep 5
+echo "Waiting for slurpd to die..."
+wait $SLURPPID
 
 echo "Applying more changes to the master slapd..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
@@ -342,4 +342,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index e212798a60a0b9e985ea563b91b23025ec5320f8..d37fcb77c634bfbf46dcdef77063f65d9effdd0f 100755 (executable)
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -86,4 +86,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index ceb34016a461e46c8341b2a9a8c35b786a94fc85..40118f8fcc3903a8e34ec7bbd9c0601f1841813b 100755 (executable)
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -163,4 +163,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd
index 01801bf42864528f2adb4d2a8d761c7a67895e31..a1a3edb1af41a8124d5b9235580f4a082fb7a1ec 100755 (executable)
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@@ -183,4 +183,7 @@ $LDAPSEARCH -h $LOCALHOST -p $PORT1 \
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test011-glue-slapadd b/tests/scripts/test011-glue-slapadd
index 05c0926a2961ce9430c931c5dd44e79e53613e91..cae730bd3ebc148993cf2eb891aacfdbc7542a59 100755 (executable)
--- a/tests/scripts/test011-glue-slapadd
+++ b/tests/scripts/test011-glue-slapadd
@@ -90,4 +90,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test012-glue-populate b/tests/scripts/test012-glue-populate
index 2424932e96f60519899de77fadd3450393e2f102..a9124eb6043e6fbb19b3d03a40a0d978de202af5 100755 (executable)
--- a/tests/scripts/test012-glue-populate
+++ b/tests/scripts/test012-glue-populate
@@ -77,4 +77,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test013-language b/tests/scripts/test013-language
index 451073d6110c2c48c0479b6efb094a7bbf2d1171..5a2fe761bf14cbbc682fa59216794eb70e0a95f1 100755 (executable)
--- a/tests/scripts/test013-language
+++ b/tests/scripts/test013-language
@@ -111,4 +111,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami
index 0428acd412b040df8109a7992abbcb0da73e29ec..e9d38994fbca131198d675e26947518c10ad3d3d 100755 (executable)
--- a/tests/scripts/test014-whoami
+++ b/tests/scripts/test014-whoami
@@ -457,6 +457,9 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0
 
 ## Note to developers: when SLAPD_DEBUG=-1 the command

diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch
index d25246d72c4026f1872a7da5a47619d5ecd615f2..72637ee7bbe3b6b09c76d1b1ff7cd5f17382d5d5 100755 (executable)
--- a/tests/scripts/test015-xsearch
+++ b/tests/scripts/test015-xsearch
@@ -235,4 +235,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref
index c5eb1827c723d9aaff5c86be4f708a9f87c92fde..04d4f5cb57b9db7e5bb67fe2fc22c60b4ba42924 100755 (executable)
--- a/tests/scripts/test016-subref
+++ b/tests/scripts/test016-subref
@@ -190,4 +190,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh
index bb5183b62343f643586c1ee8c9673800124094a2..54fbb115191e27c42e6b0cbdb1a0bbbdce407945 100755 (executable)
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@@ -263,4 +263,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index 3b325d53c5a2b953b0257be58917738b5dcfd277..65685cb01a447378dbb917ec52ae5065c0c06ab6 100755 (executable)
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -123,6 +123,7 @@ sleep 15
 
 echo "Stopping the provider, sleeping 10 seconds and restarting it..."
 kill -HUP "$PID"
+wait $PID
 sleep 10
 echo "RESTART" >> $LOG1
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
@@ -244,7 +245,7 @@ sleep 15
 
 echo "Stopping consumer to test recovery..."
 kill -HUP $SLAVEPID
-sleep 10
+wait $SLAVEPID
 
 echo "Modifying more entries on the master..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \
@@ -340,4 +341,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade
index 13dbc3899820067349d7c87bed6be87386ba66e0..ff8e541c37d7c8a082184523fb7838b80518e284 100755 (executable)
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@@ -451,4 +451,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index 209beb2429b037c0402cd58e00255af8bffbffa2..4c9a12fcd55e64c702d179d25ab370d3874ed9ac 100755 (executable)
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -303,4 +303,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test021-certificate b/tests/scripts/test021-certificate
index 1984ae95aa6fe790b357142eb8f0dcbb413dfc09..85ac28543d9ea9e66e5d3bf8aff84c478ed3821c 100755 (executable)
--- a/tests/scripts/test021-certificate
+++ b/tests/scripts/test021-certificate
@@ -316,4 +316,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy
index 925e925379bfc3e3d20e1618b0a0059c0d710252..7f55cd09bcb285563b4d4e8a48ef45340f3ac9a6 100755 (executable)
--- a/tests/scripts/test022-ppolicy
+++ b/tests/scripts/test022-ppolicy
@@ -343,4 +343,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint
index 2e500d46e25c627b375634f8d77b4f03d34028c9..dddf79fad06cbd024fa6f2fb7adbf7d3bf69a730 100755 (executable)
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@@ -185,4 +185,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test024-unique b/tests/scripts/test024-unique
index 7cfdda002f4d75013eb0995d9f9e6b1a12d87b30..dff70391a812fda7b3b193e4f8d0c8f8d1cad0e1 100755 (executable)
--- a/tests/scripts/test024-unique
+++ b/tests/scripts/test024-unique
@@ -127,4 +127,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits
index 02bf2f0396d220745d93c115d75272317a816557..b5137080061e8945f31b8a2ae2f09ed21c4d12ee 100755 (executable)
--- a/tests/scripts/test025-limits
+++ b/tests/scripts/test025-limits
@@ -1362,4 +1362,7 @@ esac
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test026-dn b/tests/scripts/test026-dn
index 9337048cfa5810f89185fe593cf91c55d1470870..9e25d88ae94b57b8ff63ff1f06402a2ad8ed01c2 100755 (executable)
--- a/tests/scripts/test026-dn
+++ b/tests/scripts/test026-dn
@@ -160,4 +160,7 @@ fi
 #####
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test027-emptydn b/tests/scripts/test027-emptydn
index 7eaa289c080c72e2c6bee06b8bd9009d908d64ca..9d0e7dfc10f4ed85a5b3c91e0c707d8730355c3f 100755 (executable)
--- a/tests/scripts/test027-emptydn
+++ b/tests/scripts/test027-emptydn
@@ -75,7 +75,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-test $KILLSERVERS != no && kill -HUP $KILLPIDS
+kill -HUP $KILLPIDS
 wait
 
 LDIFOUT=$EMPTYDNOUT1
@@ -169,4 +169,7 @@ fi
 #####
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test028-idassert b/tests/scripts/test028-idassert
index 935f0b7a5aedcebe4e0e3050336169e5f612d4f5..772f3d5f87b1a238c627102ba3ce627cb3b0f026 100755 (executable)
--- a/tests/scripts/test028-idassert
+++ b/tests/scripts/test028-idassert
@@ -248,5 +248,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
-exit 0
 
+test $KILLSERVERS != no && wait
+
+exit 0

diff --git a/tests/scripts/test029-ldapglue b/tests/scripts/test029-ldapglue
index 5331cee7643def71e78a13dec016e007a46257c5..233d1f2eab71a0fcb83c843f9934fbc57de7c9d1 100755 (executable)
--- a/tests/scripts/test029-ldapglue
+++ b/tests/scripts/test029-ldapglue
@@ -218,5 +218,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
-exit 0
 
+test $KILLSERVERS != no && wait
+
+exit 0

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index 088f059d4658101c5e9d589181a3094a5caae3cf..3164dca9e4f93862823d66e14e9fd8a599d3ed13 100755 (executable)
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@@ -103,5 +103,7 @@ for RELAY in $RELAYS ; do
 done
 
 echo ">>>>> Test succeeded"
-exit 0
 
+test $KILLSERVERS != no && wait
+
+exit 0

diff --git a/tests/scripts/test031-component-filter b/tests/scripts/test031-component-filter
index 194cd88d44d9c3b8c83fea28e4b2ba9e0dc397f5..421dce66449de73e654a8eac6fa553a5edd7cf19 100755 (executable)
--- a/tests/scripts/test031-component-filter
+++ b/tests/scripts/test031-component-filter
@@ -324,4 +324,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test032-chain b/tests/scripts/test032-chain
index bb76155831c8b66cbdca15eaab08d813bd294c69..e03d55d1da6e0887ada3af27a16ae775bbaa1064 100755 (executable)
--- a/tests/scripts/test032-chain
+++ b/tests/scripts/test032-chain
@@ -307,5 +307,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
-exit 0
 
+test $KILLSERVERS != no && wait
+
+exit 0

diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl
index 2612b4d27b8334626b16692dde2e635af6f7201f..8e16fcf6747a99cf1b84d03bab879ec77730d981 100755 (executable)
--- a/tests/scripts/test033-glue-syncrepl
+++ b/tests/scripts/test033-glue-syncrepl
@@ -161,4 +161,7 @@ done
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent
index e0a03f9e2087c7a792de65fb45ef692b9c41dda4..6963a550130edbe6f0f65c4abf9bd15fb1d9164b 100755 (executable)
--- a/tests/scripts/test034-translucent
+++ b/tests/scripts/test034-translucent
@@ -203,7 +203,7 @@ fi
 
 echo "Shutting down local slapd..."
 kill -HUP $LOCALPID
-sleep 5
+wait $LOCALPID
 
 echo "Configuring local slapd without translucent_no_glue..."
 . $CONFFILTER $BACKEND $MONITORDB < $TRANSLUCENTLOCALCONF | \
@@ -626,7 +626,7 @@ fi
 
 echo "Shutting down local slapd..."
 kill -HUP $LOCALPID
-sleep 5
+wait $LOCALPID
 
 echo "Configuring local slapd with translucent_strict..."
 echo translucent_strict >> $CONF2
@@ -723,4 +723,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test035-meta b/tests/scripts/test035-meta
index d7513ebd814da2850f4a08a8683f04f7c373fe14..5bdc5ddc577a5460bf433c699e970a9a3727c11c 100755 (executable)
--- a/tests/scripts/test035-meta
+++ b/tests/scripts/test035-meta
@@ -720,5 +720,7 @@ esac
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
-exit 0
 
+test $KILLSERVERS != no && wait
+
+exit 0

diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index 72c7f2ed879dcd67beb7d0b6ac26949c4f057ede..bf954435f3d62bd47ac098f94a814be5fa0012e8 100755 (executable)
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -224,4 +224,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test037-manage b/tests/scripts/test037-manage
index 9f0345f771e6dcfe7f92be69b1b16d7ec7820761..f37cb39249b6112db44537115cef8a83221992b9 100755 (executable)
--- a/tests/scripts/test037-manage
+++ b/tests/scripts/test037-manage
@@ -242,4 +242,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test038-retcode b/tests/scripts/test038-retcode
index 6beb1469dba165545d3454c1ea100b7c2f8efff6..024437fcdf1117f7dd79238076871c222c9ecb9a 100755 (executable)
--- a/tests/scripts/test038-retcode
+++ b/tests/scripts/test038-retcode
@@ -106,4 +106,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test039-glue-ldap-concurrency b/tests/scripts/test039-glue-ldap-concurrency
index 9eee1ab4019e9b5ee3006c1e878c5c71165c9e34..1a8f9574474ed5cb3bba5c89c02ea315032df55f 100755 (executable)
--- a/tests/scripts/test039-glue-ldap-concurrency
+++ b/tests/scripts/test039-glue-ldap-concurrency
@@ -201,5 +201,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
-exit 0
 
+test $KILLSERVERS != no && wait
+
+exit 0

diff --git a/tests/scripts/test040-subtree-rename b/tests/scripts/test040-subtree-rename
index bdcbeb206ebb583621e993f3b9059a5a27287bf6..cbdb97eb79c7010a41f23a5f0135f9d078367c21 100755 (executable)
--- a/tests/scripts/test040-subtree-rename
+++ b/tests/scripts/test040-subtree-rename
@@ -206,4 +206,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test041-aci b/tests/scripts/test041-aci
index 83fba8c4ba2c393937d0097f3cd8206a5cf8c3cd..0d8e27ef481bbf4e44a6c7abf752de21673ec930 100755 (executable)
--- a/tests/scripts/test041-aci
+++ b/tests/scripts/test041-aci
@@ -255,4 +255,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort
index ba352e61e36f7c574bdfce6609d73f9a10662587..6e72d0b9a891f2c7485fa48a866f05a92d706e26 100755 (executable)
--- a/tests/scripts/test042-valsort
+++ b/tests/scripts/test042-valsort
@@ -218,4 +218,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test043-delta-syncrepl b/tests/scripts/test043-delta-syncrepl
index 6ca84555c9e36a3993bf1b749d2f9aad9c7cc445..6c0bf33d964e911b158e8f529415fa194eb71525 100755 (executable)
--- a/tests/scripts/test043-delta-syncrepl
+++ b/tests/scripts/test043-delta-syncrepl
@@ -344,4 +344,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test044-dynlist b/tests/scripts/test044-dynlist
index 514069a3387e13b58f01f92c2f2d77e6baed17a5..e1a5487f3b97770458fc6e15c391b0dfa9764188 100755 (executable)
--- a/tests/scripts/test044-dynlist
+++ b/tests/scripts/test044-dynlist
@@ -448,4 +448,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied
index 741e30f40a3020b0f8a6a5055d85fd667d81e722..be4f408d71c4b047c3ad18a7c233f84be55d3925 100755 (executable)
--- a/tests/scripts/test045-syncreplication-proxied
+++ b/tests/scripts/test045-syncreplication-proxied
@@ -697,4 +697,7 @@ fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0

diff --git a/tests/scripts/test046-dds b/tests/scripts/test046-dds
index 7630a335038530aaebec62cbfbfadfaacbb6991b..c36800090abc194ab61c7cfbdefec40e05f3d874 100755 (executable)
--- a/tests/scripts/test046-dds
+++ b/tests/scripts/test046-dds
@@ -526,4 +526,7 @@ if test $? != 0 ; then
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0