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

[tridge at samba.org]

Author: tridge
Date: 2006-08-22 11:26:27 +0000 (Tue, 22 Aug 2006)
New Revision: 17708

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

Log:

make the automated testing of the ldb ldap backend more portable

Modified:
   branches/SAMBA_4_0/source/lib/ldb/tests/init_slapd.sh
   branches/SAMBA_4_0/source/lib/ldb/tests/test-ldap.sh


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tests/init_slapd.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tests/init_slapd.sh	2006-08-22 10:49:54 UTC (rev 17707)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/init_slapd.sh	2006-08-22 11:26:27 UTC (rev 17708)
@@ -8,11 +8,13 @@
 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

Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-ldap.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tests/test-ldap.sh	2006-08-22 10:49:54 UTC (rev 17707)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/test-ldap.sh	2006-08-22 11:26:27 UTC (rev 17708)
@@ -16,11 +16,11 @@
 	    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