ITS#5810: support back-ldif

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 267422ca6843ce3959f1833f41d14db8fe85fa2a..30924d72c692b2f4555e32eaa8d357aebe7af220 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -53,6 +53,10 @@ sql-yes sql-mod:     FORCE
        @echo "Initiating LDAP tests for SQL..."
        @$(RUN) -b sql sql-all
 
+ldif test-ldif: FORCE
+       @echo "Initiating LDAP tests for LDIF..."
+       @$(RUN) -b ldif all
+
 regressions:   FORCE
        @echo "Testing (available) ITS regressions"
        @$(RUN) its-all

diff --git a/tests/scripts/test011-glue-slapadd b/tests/scripts/test011-glue-slapadd
index e2765b5e635fc9322a1d755ed7531905b85ae010..8f47acaa9acf2d63235918e00407081781d39106 100755 (executable)
--- a/tests/scripts/test011-glue-slapadd
+++ b/tests/scripts/test011-glue-slapadd
@@ -56,9 +56,9 @@ if test $RC != 0 ; then
 fi
 
 echo "Filtering ldapsearch results..."
-$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER -s ldif=e < $SEARCHOUT > $SEARCHFLT
 echo "Filtering original ldif used to create database..."
-$LDIFFILTER < $LDIFGLUED > $LDIFFLT
+$LDIFFILTER -s ldif=e < $LDIFGLUED > $LDIFFLT
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 

diff --git a/tests/scripts/test012-glue-populate b/tests/scripts/test012-glue-populate
index 47d8c3ab47ece0da8a468a4158269848e0651e44..116546ccce94f95617a11aa0bd19a1e1e85817de 100755 (executable)
--- a/tests/scripts/test012-glue-populate
+++ b/tests/scripts/test012-glue-populate
@@ -65,9 +65,9 @@ if test $RC != 0 ; then
 fi
 
 echo "Filtering ldapsearch results..."
-$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER -s ldif=e < $SEARCHOUT > $SEARCHFLT
 echo "Filtering original ldif used to create database..."
-$LDIFFILTER < $LDIFGLUED > $LDIFFLT
+$LDIFFILTER -s ldif=e < $LDIFGLUED > $LDIFFLT
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 

diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade
index 8ac0b42d94b44fce478c76d8c01ffd3c23abc7b5..94aea54976ebb053cc4990588a9d96b131dd6bad 100755 (executable)
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@@ -13,11 +13,6 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" ; then
-       echo "Test does not support $BACKEND"
-       exit 0
-fi
-
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 

diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint
index a73d700e265e2a9ac891fdbdaf08b8607b305b84..72de1103f2f2e01c320d26ef3286ba722be730fe 100755 (executable)
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@@ -13,11 +13,6 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" ; then
-       echo "Test does not support $BACKEND"
-       exit 0
-fi
-
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
@@ -194,7 +189,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-if test $BACKEND = "hdb" ; then
+if test $BACKEND != "bdb" ; then
        $LDAPMODIFY -v -D "$REFINTDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
                $TESTOUT 2>&1 << EDEL
 version: 1

diff --git a/tests/scripts/test028-idassert b/tests/scripts/test028-idassert
index 75f1a8b60d7a6de44ccc1262e07d90ba71622abb..59d45db3d8cbcc4bb1a830e082fd76e6c06aea0e 100755 (executable)
--- a/tests/scripts/test028-idassert
+++ b/tests/scripts/test028-idassert
@@ -205,12 +205,12 @@ if test $RC != 0 ; then
 fi
 
 echo "Filtering ldapsearch results..."
-$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER -s ldif=e < $SEARCHOUT > $SEARCHFLT
 echo "Filtering original ldif used to create database..."
-$LDIFFILTER < $IDASSERTOUT > $LDIFFLT
+$LDIFFILTER -s ldif=e < $IDASSERTOUT > $LDIFFLT
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
-       
+
 if test $? != 0 ; then
        echo "comparison failed - search with identity assertion didn't succeed"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS

diff --git a/tests/scripts/test029-ldapglue b/tests/scripts/test029-ldapglue
index 29d9677a4ff9daa7d570e57852d50b7de6df5a4c..59bff07214a83fa37600dab0712053922445de42 100755 (executable)
--- a/tests/scripts/test029-ldapglue
+++ b/tests/scripts/test029-ldapglue
@@ -149,9 +149,9 @@ if test $RC != 0 ; then
 fi
 
 echo "Filtering ldapsearch results..."
-$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER -s ldif=e < $SEARCHOUT > $SEARCHFLT
 echo "Filtering original ldif used to create database..."
-$LDIFFILTER < $LDAPGLUEOUT > $LDIFFLT
+$LDIFFILTER -s ldif=e < $LDAPGLUEOUT > $LDIFFLT
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
        

diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort
index 8566a1f1f566f9b245bcd9b43d1e54484f653367..640e7e04f323ba7942f9cf80d5d31657645b0846 100755 (executable)
--- a/tests/scripts/test042-valsort
+++ b/tests/scripts/test042-valsort
@@ -204,9 +204,11 @@ if test $RC != 0 ; then
 fi
 
 echo "Filtering ldapsearch results..."
-$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER -s ldif=e < $SEARCHOUT > $SEARCHFLT
+echo "Filtering expected ldif..."
+$LDIFFILTER -s ldif=e < $VALSORTOUT3 > $LDIFFLT
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $VALSORTOUT3 > $CMPOUT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "Comparison failed"

diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied
index b0791c326bc772323bd80f3216e54d6293d9c0d6..5f0657b1549435788dc94529586807d1ed317f9d 100755 (executable)
--- a/tests/scripts/test045-syncreplication-proxied
+++ b/tests/scripts/test045-syncreplication-proxied
@@ -13,10 +13,6 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" ; then
-       echo "Test does not support $BACKEND"
-       exit 0
-fi
 
 # test now handles known issues
 #if test x"$PROXYSYNC" = x ; then

diff --git a/tests/scripts/test052-memberof b/tests/scripts/test052-memberof
index 8dc24f784892f39f44e70418bd84bfd784bc6c6d..16a6ef1fd684190ac64031de6ffd3a22f8c283b4 100755 (executable)
--- a/tests/scripts/test052-memberof
+++ b/tests/scripts/test052-memberof
@@ -72,6 +72,16 @@ EOF
        fi
 fi
 
+bdb_conf=""
+case $BACKEND in bdb | hdb)
+bdb_conf="olcDbCacheSize: 1000
+olcDbIndex: objectClass eq
+olcDbIndex: cn pres,eq,sub
+olcDbIndex: uid pres,eq,sub
+olcDbIndex: sn pres,eq,sub
+olcDbMode: 384"
+esac
+
 echo "Running ldapadd to build slapd config database..."
 $LDAPADD -h $LOCALHOST -p $PORT1 -D 'cn=config' -w `cat $CONFIGPWF` \
        >> $TESTOUT 2>&1 <<EOF
@@ -104,12 +114,7 @@ olcRootDN: cn=Manager,$BASEDN
 olcRootPW:: c2VjcmV0
 olcMonitoring: TRUE
 olcDbDirectory: $TESTDIR/db.1.a/
-olcDbCacheSize: 1000
-olcDbIndex: objectClass eq
-olcDbIndex: cn pres,eq,sub
-olcDbIndex: uid pres,eq,sub
-olcDbIndex: sn pres,eq,sub
-olcDbMode: 384
+$bdb_conf
 
 dn: olcOverlay={0}memberof,olcDatabase={1}$BACKEND,cn=config
 objectClass: olcOverlayConfig

diff --git a/tests/scripts/test054-syncreplication-parallel-load b/tests/scripts/test054-syncreplication-parallel-load
index a7f0357797ea6fdab119247317421419b99eba27..c2770d0f9595fa68b1d27b96f6f4cfca094aca46 100755 (executable)
--- a/tests/scripts/test054-syncreplication-parallel-load
+++ b/tests/scripts/test054-syncreplication-parallel-load
@@ -13,11 +13,6 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" ; then
-       echo "Test does not support $BACKEND"
-       exit 0
-fi
-
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 

diff --git a/tests/scripts/test055-valregex b/tests/scripts/test055-valregex
index bf226fa4af188ae09c69a60d3130103fba733a85..006e3c781c0acbe48d406b41fa7f8b5b16cfaad8 100755 (executable)
--- a/tests/scripts/test055-valregex
+++ b/tests/scripts/test055-valregex
@@ -13,14 +13,6 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-case "$BACKEND" in
-bdb|hdb)
-       ;;
-*)
-       echo "Test does not support $BACKEND backend"
-       exit 0
-esac
-
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 LVL=acl

diff --git a/tests/scripts/test057-memberof-refint b/tests/scripts/test057-memberof-refint
index 989b9f4bb8990c82269735bff91ac02a692f9bba..f392ec916c89162cb95e24f7afb7037a267c524b 100755 (executable)
--- a/tests/scripts/test057-memberof-refint
+++ b/tests/scripts/test057-memberof-refint
@@ -27,7 +27,7 @@ if test $REFINT = refintno; then
        exit 0
 fi 
 
-if test "$BACKEND" != "hdb" ; then
+if test "$BACKEND" = "bdb" ; then
        echo "Test does not support $BACKEND"
        exit 0
 fi
@@ -84,6 +84,16 @@ EOF
        fi
 fi
 
+bdb_conf=""
+case $BACKEND in bdb | hdb)
+bdb_conf="olcDbCacheSize: 1000
+olcDbIndex: objectClass eq
+olcDbIndex: cn pres,eq,sub
+olcDbIndex: uid pres,eq,sub
+olcDbIndex: sn pres,eq,sub
+olcDbMode: 384"
+esac
+
 echo "Running ldapadd to build slapd config database..."
 $LDAPADD -h $LOCALHOST -p $PORT1 -D 'cn=config' -w `cat $CONFIGPWF` \
        >> $TESTOUT 2>&1 <<EOF
@@ -96,12 +106,7 @@ olcRootDN: cn=Manager,$BASEDN
 olcRootPW:: c2VjcmV0
 olcMonitoring: TRUE
 olcDbDirectory: $TESTDIR/db.1.a/
-olcDbCacheSize: 1000
-olcDbIndex: objectClass eq
-olcDbIndex: cn pres,eq,sub
-olcDbIndex: uid pres,eq,sub
-olcDbIndex: sn pres,eq,sub
-olcDbMode: 384
+$bdb_conf
 
 # {0}memberof, {1}$BACKEND, config
 dn: olcOverlay={0}memberof,olcDatabase={1}$BACKEND,cn=config