From d939ff7beecd510cfd94687c6666c398f7adb2b4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 10 Sep 2006 22:45:45 +0000
Subject: r18346: make sure we kill off the slapd process (This used to be
 commit 0e1d4be23ab807b17959e09dffbaf9c8c8dd048e)

---
 source4/lib/ldb/tests/kill_slapd.sh | 12 ++++++++++++
 source4/lib/ldb/tests/test-ldap.sh  | 18 ++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100755 source4/lib/ldb/tests/kill_slapd.sh

(limited to 'source4')

diff --git a/source4/lib/ldb/tests/kill_slapd.sh b/source4/lib/ldb/tests/kill_slapd.sh
new file mode 100755
index 0000000000..91beb10814
--- /dev/null
+++ b/source4/lib/ldb/tests/kill_slapd.sh
@@ -0,0 +1,12 @@
+#!/bin/sh 
+
+if [ -z "$LDBDIR" ]; then
+    LDBDIR=`dirname $0`/..
+    export LDBDIR
+fi
+
+if [ -f tests/tmp/slapd.pid ]; then
+    echo "killing slapd process `cat tests/tmp/slapd.pid`"
+    kill -9 `cat tests/tmp/slapd.pid`
+    rm -f tests/tmp/slapd.pid
+fi
diff --git a/source4/lib/ldb/tests/test-ldap.sh b/source4/lib/ldb/tests/test-ldap.sh
index 63e93e0fb0..b9d224e0af 100755
--- a/source4/lib/ldb/tests/test-ldap.sh
+++ b/source4/lib/ldb/tests/test-ldap.sh
@@ -36,9 +36,19 @@ export LDB_URL
 PATH=bin:$PATH
 export PATH
 
-. $LDBDIR/tests/init_slapd.sh
-. $LDBDIR/tests/start_slapd.sh
-
 LDB_SPECIALS=0
 export LDB_SPECIALS
-. $LDBDIR/tests/test-generic.sh
+
+if $LDBDIR/tests/init_slapd.sh && 
+   $LDBDIR/tests/start_slapd.sh &&
+   $LDBDIR/tests/test-generic.sh; then
+    echo "ldap tests passed";
+    ret=0
+else
+    echo "ldap tests failed";
+    ret=$?
+fi
+
+$LDBDIR/tests/kill_slapd.sh
+
+exit $ret
-- 
cgit