svn commit: samba r18347 - in branches/SAMBA_4_0/source/lib/ldb/tests: .

tridge at samba.org tridge at samba.org
Sun Sep 10 22:53:21 GMT 2006


Author: tridge
Date: 2006-09-10 22:53:21 +0000 (Sun, 10 Sep 2006)
New Revision: 18347

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18347

Log:

run slapd in the foreground so timelimit can kill it

Modified:
   branches/SAMBA_4_0/source/lib/ldb/tests/start_slapd.sh


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tests/start_slapd.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tests/start_slapd.sh	2006-09-10 22:45:45 UTC (rev 18346)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/start_slapd.sh	2006-09-10 22:53:21 UTC (rev 18347)
@@ -7,7 +7,8 @@
 
 mkdir -p $LDBDIR/tests/tmp/db
 
-# not having slapd isn't considered a ldb test failure
-slapd -f $LDBDIR/tests/slapd.conf -h "`$LDBDIR/tests/ldapi_url.sh`" $* || exit 0
+# running slapd with -d0 means it stays in the same process group, so it can be
+# killed by timelimit
+slapd -d0 -f $LDBDIR/tests/slapd.conf -h "`$LDBDIR/tests/ldapi_url.sh`" $* &
 
 sleep 2



More information about the samba-cvs mailing list