From: Howard Chu <hyc@openldap.org>
Date: Sat, 17 Apr 2004 15:46:18 +0000 (+0000)
Subject: Cleanup
X-Git-Tag: OPENDLAP_REL_ENG_2_2_MP~485
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=047ad1298b09ddb65ad4263b1969e4ed3cdff2e1;p=openldap

Cleanup
---

diff --git a/tests/data/slapd-refint.conf b/tests/data/slapd-refint.conf
index 5af2637517..45ee73f9f8 100644
--- 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 306ce23bb3..42278b8e5e 100644
--- 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 02f3a64c05..78ac4d8c88 100755
--- 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 a6939a9220..1e60a4c055 100755
--- 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