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

[tridge at samba.org]

Author: tridge
Date: 2005-07-15 11:27:32 +0000 (Fri, 15 Jul 2005)
New Revision: 8490

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

Log:
make the ldb tests more portable


Modified:
   branches/SAMBA_4_0/source/lib/ldb/tests/test-extended.sh
   branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh
   branches/SAMBA_4_0/source/lib/ldb/tests/test-tdb-features.sh


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-extended.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tests/test-extended.sh	2005-07-15 11:23:17 UTC (rev 8489)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/test-extended.sh	2005-07-15 11:27:32 UTC (rev 8490)
@@ -38,7 +38,7 @@
 checkcount() {
     count=$1
     expression="$2"
-    n=`bin/ldbsearch "$expression" | grep ^dn | wc -l`
+    n=`bin/ldbsearch "$expression" | grep '^dn' | wc -l`
     if [ $n != $count ]; then
 	echo "Got $n but expected $count for $expression"
 	bin/ldbsearch "$expression"

Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh	2005-07-15 11:23:17 UTC (rev 8489)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh	2005-07-15 11:27:32 UTC (rev 8490)
@@ -58,7 +58,7 @@
 time $VALGRIND ldbtest --num-records 100 --num-searches 500  || exit 1
 
 echo "Testing one level search"
-count=`$VALGRIND ldbsearch -b 'ou=Groups,o=University of Michigan,c=TEST' -s one 'objectclass=*' none |grep ^dn | wc -l`
+count=`$VALGRIND ldbsearch -b 'ou=Groups,o=University of Michigan,c=TEST' -s one 'objectclass=*' none |grep '^dn' | wc -l`
 if [ $count != 3 ]; then
     echo returned $count records - expected 3
     exit 1

Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-tdb-features.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tests/test-tdb-features.sh	2005-07-15 11:23:17 UTC (rev 8489)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/test-tdb-features.sh	2005-07-15 11:27:32 UTC (rev 8490)
@@ -7,7 +7,7 @@
 checkcount() {
     count=$1
     expression="$2"
-    n=`bin/ldbsearch "$expression" | grep ^dn | wc -l`
+    n=`bin/ldbsearch "$expression" | grep '^dn' | wc -l`
     if [ $n != $count ]; then
 	echo "Got $n but expected $count for $expression"
 	$VALGRIND bin/ldbsearch "$expression"