Fixup maindb/indexdb

This commit is contained in:
Hallvard Furuseth 2011-08-28 13:00:57 +02:00
parent cc2b67329a
commit 8d78d1e8a0
3 changed files with 9 additions and 5 deletions

View File

@ -169,8 +169,8 @@ if test "x$BACKENDTYPE" = "x" ; then
BACKENDTYPE="unknown"
fi
# DB types with indexing, and the main DB types with some other stuff:
# currently mode, limits, paged results.
# Backend features. indexdb: indexing and unchecked limit.
# maindb: main storage backend. Currently index,limits,mode,paged results.
INDEXDB=noindexdb MAINDB=nomaindb
case $BACKEND in
bdb|hdb|mdb) INDEXDB=indexdb MAINDB=maindb ;;

View File

@ -501,7 +501,7 @@ case $RC in
;;
esac
if test $MAINDB = maindb ; then
if test $INDEXDB = indexdb ; then
echo "Testing higher than unchecked limit requested for unchecked limited ID..."
$LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \

View File

@ -100,10 +100,14 @@ echo "Filtering ldapsearch results..."
$LDIFFILTER -b monitor < $SEARCHOUT > $SEARCHFLT
TMPMONITOROUT2=$MONITOROUT2
if test $MAINDB != maindb ; then
case $BACKEND in
bdb|hdb)
;;
*)
TMPMONITOROUT2=$TESTDIR/monitor2.out
grep -v "olmBDB" $MONITOROUT2 > $TMPMONITOROUT2
fi
;;
esac
echo "Comparing filter output..."
$CMP $SEARCHFLT $TMPMONITOROUT2 > $CMPOUT