sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r17708: make the automated testing of the ldb ldap backend more portable

Browse Source 
(This used to be commit bf88bc5de6)
This commit is contained in:
Andrew Tridgell 2006-08-22 11:26:27 +00:00 committed by Gerald (Jerry) Carter
parent b2658f0dd6
commit d8f2434296
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/lib/ldb/tests/init_slapd.sh
View File

@ -8,11 +8,13 @@ fi
rm -rf tests/tmp/db
mkdir -p tests/tmp/db
if pidof slapd > /dev/null; then
killall slapd
if [ -f tests/tmp/slapd.pid ]; then
kill `cat tests/tmp/slapd.pid`
sleep 1
fi
sleep 2
if pidof slapd > /dev/null; then
killall -9 slapd
if [ -f tests/tmp/slapd.pid ]; then
kill -9 `cat tests/tmp/slapd.pid`
rm -f tests/tmp/slapd.pid
fi
slapadd -f $LDBDIR/tests/slapd.conf < $LDBDIR/tests/init.ldif || exit 1

4
source4/lib/ldb/tests/test-ldap.sh
View File

@ -16,11 +16,11 @@ for f in $SCHEMA_NEEDED; do
continue;
fi
echo "ERROR: you need the following OpenLDAP schema files in tests/schema/"
echo "SKIPPING TESTS: you need the following OpenLDAP schema files"
for f in $SCHEMA_NEEDED; do
echo " $f.schema"
done
exit 1
exit 0
fi
done