Cleanup

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

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

tests/scripts/test023-refint

-#! /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

tests/scripts/test024-unique

-#! /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