Cleanup

diff --git a/tests/data/slapd-refint.conf b/tests/data/slapd-refint.conf
index 5af263751754ee7d1562d44e241c175ec97fb15d..45ee73f9f883f4adccce718f7eb4845121bc7ffb 100644 (file)
--- a/tests/data/slapd-refint.conf
+++ b/tests/data/slapd-refint.conf
@@ -26,7 +26,7 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath        ../servers/slapd/back-@BACKEND@/:../servers/slapd/overlays
 #mod#moduleload        back_@BACKEND@.la
-#mod#moduleload refint.la
+#refintmod#moduleload refint.la
 
 #######################################################################
 # database definitions

diff --git a/tests/data/slapd-unique.conf b/tests/data/slapd-unique.conf
index 306ce23bb327b0abfcd2fa0053b61f73d4283a1c..42278b8e5e49ed84561581d878d2204e722fde58 100644 (file)
--- a/tests/data/slapd-unique.conf
+++ b/tests/data/slapd-unique.conf
@@ -26,7 +26,7 @@ argsfile    ./testrun/slapd.1.args
 
 #mod#modulepath        ../servers/slapd/back-@BACKEND@/:../servers/slapd/overlays
 #mod#moduleload        back_@BACKEND@.la
-#mod#moduleload unique.la
+#uniquemod#moduleload unique.la
 
 #######################################################################
 # database definitions

diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint
index 02f3a64c0525c5506a95e9e28d58150c8674d3dc..78ac4d8c88104bf95b932bddbb7e1de7f373dede 100755 (executable)
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@@ -1,4 +1,4 @@
-#! /bin/sh -xv
+#! /bin/sh
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
@@ -44,8 +44,7 @@ KILLPIDS="$PID"
 echo "Testing slapd referential integrity operations..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
-               'objectclass=*' 
-#> /dev/null 2>&1
+               'objectclass=*' > /dev/null 2>&1
        RC=$?
        if test $RC = 0 ; then
                break

diff --git a/tests/scripts/test024-unique b/tests/scripts/test024-unique
index a6939a9220ed2707b8686e20d58dfd0b3694e6c6..1e60a4c0558d18531e9f5ae6074f832ab8014723 100755 (executable)
--- a/tests/scripts/test024-unique
+++ b/tests/scripts/test024-unique
@@ -1,4 +1,4 @@
-#! /bin/sh -xv
+#! /bin/sh
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
@@ -107,10 +107,10 @@ givenName: Bill
 EOTUNIQ2
 
 RC=$?
-if test $RC != 0 ; then
-       echo "ldapadd failed ($RC)!"
+if test $RC != 19 ; then
+       echo "unique check failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
-       exit $RC
+       exit -1
 fi