Support back-null

diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf
index b78bf2300844dfb8d872caa0627a3ed23f2c585c..23805acf74aa7dc5e66d14a513922379a301da1a 100644 (file)
--- a/tests/data/slapd-syncrepl-slave-refresh1.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh1.conf
@@ -37,6 +37,7 @@ database      @BACKEND@
 suffix         "dc=example,dc=com"
 rootdn         "cn=Replica,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
 #~null~#directory      @TESTDIR@/db.2.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub

diff --git a/tests/data/slapd-valregex.conf b/tests/data/slapd-valregex.conf
index 5059e1d85ce9d421f68c3be3878ba192b547d810..78df8b1e792d28d11abf722d6ef64fa751eec799 100644 (file)
--- a/tests/data/slapd-valregex.conf
+++ b/tests/data/slapd-valregex.conf
@@ -45,6 +45,7 @@ database      @BACKEND@
 suffix         "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
 #~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub

diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index dcf52f3b4eb491778e6baf1dcff919fc72ad1797..df785c2ecdbde27b9c2ad317b4c0afed76c96bfa 100644 (file)
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@@ -40,6 +40,7 @@ database      @BACKEND@
 suffix         "dc=example,dc=com"
 rootdn         "cn=Manager,dc=example,dc=com"
 rootpw         secret
+#null#bind             on
 #~null~#directory      @TESTDIR@/db.1.a
 #bdb#index             objectClass     eq
 #bdb#index             cn,sn,uid       pres,eq,sub

diff --git a/tests/run.in b/tests/run.in
index af8a79db2b0bd011616f8408bbefc0e9a59744c1..0a9df274e39e70d60fff60f0ce93e1a939ebe3e4 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -29,6 +29,7 @@ AC_hdb=@BUILD_HDB@
 AC_ldap=ldap@BUILD_LDAP@
 AC_meta=meta@BUILD_META@
 AC_monitor=@BUILD_MONITOR@
+AC_null=null@BUILD_NULL@
 AC_relay=relay@BUILD_RELAY@
 AC_sql=sql@BUILD_SQL@
 
@@ -63,7 +64,7 @@ if test "${AC_meta}" = "metamod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
        AC_meta="metano"
 fi
 
-export AC_bdb AC_hdb AC_ldap AC_meta AC_monitor AC_relay AC_sql \
+export AC_bdb AC_hdb AC_ldap AC_meta AC_monitor AC_null AC_relay AC_sql \
        AC_accesslog AC_dds AC_dynlist AC_memberof AC_pcache AC_ppolicy \
        AC_refint AC_retcode AC_rwm AC_unique AC_syncprov AC_translucent \
        AC_valsort \

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index bb50966d818407ce7def1448027febf66f79da40..c031e9111d881168869b1ecf256a50e6762f2cb1 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -40,6 +40,7 @@ sed -e "s/@BACKEND@/${BACKEND}/"                      \
        -e "s/^#${BACKENDTYPE}#//"                      \
        -e "s/^#${AC_ldap}#//"                          \
        -e "s/^#${AC_meta}#//"                          \
+       -e "s/^#${AC_null}#//"                          \
        -e "s/^#${AC_relay}#//"                         \
        -e "s/^#${AC_sql}#//"                           \
                -e "s/^#${RDBMS}#//"                    \

diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index bcecc837d50d99fb17e4bbb91388a30ece3f668a..b107d992ef1f6249041e590ac562d56efa6bb3e7 100755 (executable)
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -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" && test "$BACKEND" != "ldif"; then
-       echo "Test does not support $BACKEND"
-       exit 0
-fi
-
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 

diff --git a/tests/scripts/test024-unique b/tests/scripts/test024-unique
index 286677f85afaa53e5322069fbd2a3eef77ab4412..4986da89068e00e47f05046266906295a700227f 100755 (executable)
--- a/tests/scripts/test024-unique
+++ b/tests/scripts/test024-unique
@@ -21,10 +21,8 @@ if test $UNIQUE = uniqueno; then
        exit 0
 fi
 
-if test $BACKEND = null; then
-       echo "Test does not support $BACKEND backend, test skipped"
-       exit 0
-fi
+RCODEconstraint=19
+test $BACKEND = null && RCODEconstraint=0
 
 mkdir -p $TESTDIR $DBDIR1
 
@@ -112,7 +110,7 @@ employeeType: contractor
 givenName: Bill
 EOTUNIQ2
 RC=$?
-if test $RC != 19 ; then
+if test $RC != $RCODEconstraint ; then
        echo "unique check failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit -1
@@ -228,7 +226,7 @@ employeeType: contractor
 givenName: Bill
 EOTUNIQ2
 RC=$?
-if test $RC != 19 ; then
+if test $RC != $RCODEconstraint ; then
        echo "unique check failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit -1
@@ -285,7 +283,7 @@ employeeType: contractor
 givenName: Bill
 EOTUNIQ2
 RC=$?
-if test $RC != 19 ; then
+if test $RC != $RCODEconstraint ; then
        echo "olcUniqueAttribtue single deletion hit the wrong value"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit -1
@@ -345,7 +343,7 @@ employeeType: contractor
 givenName: Bill
 EOTUNIQ2
 RC=$?
-if test $RC != 19 ; then
+if test $RC != $RCODEconstraint ; then
        echo "unique check failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit -1
@@ -510,7 +508,7 @@ cn: elvis
 EOF
 
 RC=$?
-if test $RC != 19 ; then
+if test $RC != $RCODEconstraint ; then
        echo "unique check failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit -1
@@ -582,7 +580,7 @@ description: left the building
 EOF
 
 RC=$?
-if test $RC != 19 ; then
+if test $RC != $RCODEconstraint ; then
        echo "unique check failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit -1

diff --git a/tests/scripts/test055-valregex b/tests/scripts/test055-valregex
index 006e3c781c0acbe48d406b41fa7f8b5b16cfaad8..84a97d4c91071725d86cbddb115c03e6ee2ae6c3 100755 (executable)
--- a/tests/scripts/test055-valregex
+++ b/tests/scripts/test055-valregex
@@ -74,9 +74,11 @@ case $RC in
        echo "ldapmodify failed as expected"
        ;;
 0)
-       echo "ldapmodify should have failed ($RC)!"
-       test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit -1
+       if test $BACKEND != null ; then
+               echo "ldapmodify should have failed ($RC)!"
+               test $KILLSERVERS != no && kill -HUP $KILLPIDS
+               exit -1
+       fi
        ;;
 *)
        echo "ldapmodify failed ($RC)!"