diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-10 22:53:21 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:14 -0500 |
| commit | 81e4403e79b6a21650ed7aa09563c5aa9026fdce (patch) | |
| tree | 027cd1cc94a4f0c7d38b04c0ec50fd5ff6792848 | |
| parent | d939ff7beecd510cfd94687c6666c398f7adb2b4 (diff) | |
| download | samba-81e4403e79b6a21650ed7aa09563c5aa9026fdce.tar.gz samba-81e4403e79b6a21650ed7aa09563c5aa9026fdce.tar.bz2 samba-81e4403e79b6a21650ed7aa09563c5aa9026fdce.zip | |
r18347: run slapd in the foreground so timelimit can kill it
(This used to be commit 8cc456e6dcb348375dbded0de1a0c07ea6bf8ff9)
| -rwxr-xr-x | source4/lib/ldb/tests/start_slapd.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/ldb/tests/start_slapd.sh b/source4/lib/ldb/tests/start_slapd.sh index f86555d3c9..22e8548791 100755 --- a/source4/lib/ldb/tests/start_slapd.sh +++ b/source4/lib/ldb/tests/start_slapd.sh @@ -7,7 +7,8 @@ fi 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 |