diff options
author | Andrew Tridgell <tridge@samba.org> | 2006-09-10 22:45:45 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:13 -0500 |
commit | d939ff7beecd510cfd94687c6666c398f7adb2b4 (patch) | |
tree | 65c78e8e334d31fac526352ab968b167047b3144 /source4/lib/ldb/tests/test-ldap.sh | |
parent | dc221581f0a9020665e09940c2f07b9562a387b7 (diff) | |
download | samba-d939ff7beecd510cfd94687c6666c398f7adb2b4.tar.gz samba-d939ff7beecd510cfd94687c6666c398f7adb2b4.tar.bz2 samba-d939ff7beecd510cfd94687c6666c398f7adb2b4.zip |
r18346: make sure we kill off the slapd process
(This used to be commit 0e1d4be23ab807b17959e09dffbaf9c8c8dd048e)
Diffstat (limited to 'source4/lib/ldb/tests/test-ldap.sh')
-rwxr-xr-x | source4/lib/ldb/tests/test-ldap.sh | 18 |
1 files changed, 14 insertions, 4 deletions
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 |