From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 28 Jul 2021 17:37:25 +0000 (+0000)
Subject: ITS#9617 - Use valid exit values when an error occurs
X-Git-Tag: OPENLDAP_REL_ENG_2_6_0~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc5d7f3b88abf0b87b09f923807f2348b999d486;p=thirdparty%2Fopenldap.git

ITS#9617 - Use valid exit values when an error occurs
---

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index d5e83dd37e..638c52f796 100755
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -82,7 +82,7 @@ case $RC in
 0)
 	echo "	ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "	ldapmodify failed ($RC)!"
diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 5ff434ea8b..016f797ddc 100755
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -107,7 +107,7 @@ $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 if test $? != 0 ; then
 	echo "comparison failed - modrdn operations did not complete correctly"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 
@@ -134,7 +134,7 @@ $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 if test $? != 0 ; then
 	echo "comparison failed - modrdn operations did not complete correctly"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 # Ensure that you cannot find the entry for which the rdn was deleted as
@@ -153,7 +153,7 @@ $CMP $SEARCHOUT - < /dev/null > $CMPOUT
 if test $? != 0 ; then
 	echo "failure: ldapsearch found attribute that was to be removed!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Using ldapsearch to retrieve all the entries..."
@@ -178,7 +178,7 @@ $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 if test $? != 0 ; then
 	echo "comparison failed - modrdn operations did not complete correctly"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 # Test that you can use modrdn with an attribute value which was previously
@@ -218,7 +218,7 @@ $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 if test $? != 0 ; then
 	echo "comparison failed - modrdn operations did not complete correctly"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Testing modrdn to another database (should fail with affectsMultipleDSAs)"
@@ -229,7 +229,7 @@ case $RC in
 0)
 	echo "ldapmodrdn succeeded, should have failed!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 71)
 	;;
@@ -250,7 +250,7 @@ case $RC in
 0)
 	echo "ldapmodrdn succeeded, should have failed!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 53)
 	;;
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index d6c73da687..0bea010b85 100755
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -122,7 +122,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -159,7 +159,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -183,7 +183,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -207,7 +207,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -249,7 +249,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -296,7 +296,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -344,7 +344,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -418,7 +418,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -456,7 +456,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -516,7 +516,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -539,7 +539,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -562,7 +562,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
@@ -604,7 +604,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapmodify failed ($RC)!"
diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami
index dcaccd04be..d355588d76 100755
--- a/tests/scripts/test014-whoami
+++ b/tests/scripts/test014-whoami
@@ -233,7 +233,7 @@ case $RC in
 0)
 	echo "ldapwhoami should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapwhoami failed ($RC)!"
@@ -256,7 +256,7 @@ case $RC in
 0)
 	echo "ldapwhoami should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapwhoami failed ($RC)!"
@@ -394,7 +394,7 @@ case $RC in
 0)
 	echo "ldapwhoami should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapwhoami failed ($RC)!"
@@ -417,7 +417,7 @@ case $RC in
 0)
 	echo "ldapwhoami should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapwhoami failed ($RC)!"
diff --git a/tests/scripts/test024-unique b/tests/scripts/test024-unique
index 54910059cf..b6bbe67878 100755
--- a/tests/scripts/test024-unique
+++ b/tests/scripts/test024-unique
@@ -116,7 +116,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 # ITS#6641/8057/8245
@@ -140,7 +140,7 @@ RC=$?
 if test $RC != $RCODEnorelax && test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Trying to bypass uniqueness as a normal user with ManageDSAIt..."
@@ -163,7 +163,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Bypassing uniqueness as an admin user..."
@@ -216,7 +216,7 @@ RC=$?
 if test $RC != 0 ; then
     echo "Initial configuration is not reported correctly."
     test $KILLSERVERS != no && kill -HUP $KILLPIDS
-    exit -1
+    exit 1
 fi
 
 echo Dynamically trying to add a URI with legacy attrs present...
@@ -231,7 +231,7 @@ RC=$?
 if test $RC != 80 ; then
 	echo "legacy and unique_uri allowed together"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Dynamically trying to add legacy ignored attrs with legacy attrs present...
@@ -246,7 +246,7 @@ RC=$?
 if test $RC != 80 ; then
 	echo "legacy attrs and legacy ignore attrs allowed together"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Verifying initial configuration intact...
@@ -256,7 +256,7 @@ RC=$?
 if test $RC != 0 ; then
     echo "Initial configuration damaged by unsuccessful modifies."
     test $KILLSERVERS != no && kill -HUP $KILLPIDS
-    exit -1
+    exit 1
 fi
 
 echo Dynamically removing legacy base...
@@ -270,7 +270,7 @@ RC=$?
 if test $RC != 0 ; then
 	echo "base removal failed"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Verifying base removal...
@@ -289,7 +289,7 @@ RC=$?
 if test $RC != 0 ; then
     echo "Configuration damaged by base removal"
     test $KILLSERVERS != no && kill -HUP $KILLPIDS
-    exit -1
+    exit 1
 fi
 
 echo "Adding a non-unique record..."
@@ -312,7 +312,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Trying a legacy base outside of the backend...
@@ -327,7 +327,7 @@ RC=$?
 if test $RC != 80 ; then
 	echo "out of backend scope base allowed"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Adding and removing attrs..."
@@ -346,7 +346,7 @@ RC=$?
 if test $RC != 0 ; then
 	echo "Unable to remove an attribute"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Verifying we removed the right attr..."
@@ -369,7 +369,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "olcUniqueAttribute single deletion hit the wrong value"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Removing legacy config and adding URIs...
@@ -387,7 +387,7 @@ RC=$?
 if test $RC != 0 ; then
 	echo "Reconfiguration to URIs failed"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Dynamically retrieving second configuration...
@@ -406,7 +406,7 @@ RC=$?
 if test $RC != 0 ; then
     echo "Second configuration is not reported correctly."
     test $KILLSERVERS != no && kill -HUP $KILLPIDS
-    exit -1
+    exit 1
 fi
 
 echo "Adding a non-unique record..."
@@ -429,7 +429,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Dynamically trying to add legacy base
@@ -444,7 +444,7 @@ RC=$?
 if test $RC != 80 ; then
 	echo "legacy base allowed with URIs"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Dynamically trying to add legacy attrs
@@ -459,7 +459,7 @@ RC=$?
 if test $RC != 80 ; then
 	echo "legacy attributes allowed with URIs"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Dynamically trying to add legacy strictness
@@ -474,7 +474,7 @@ RC=$?
 if test $RC != 80 ; then
 	echo "legacy strictness allowed with URIs"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 #echo ----------------------
@@ -490,7 +490,7 @@ RC=$?
 if test $RC != 80 ; then
 	echo "bad filter allowed"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Verifying second configuration intact...
@@ -500,7 +500,7 @@ RC=$?
 if test $RC != 0 ; then
     echo "Second configuration damaged by rejected modifies."
     test $KILLSERVERS != no && kill -HUP $KILLPIDS
-    exit -1
+    exit 1
 fi
 
 #echo ----------------------
@@ -520,7 +520,7 @@ RC=$?
 if test $RC != 0 ; then
 	echo "unable to reconfigure"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Dynamically retrieving third configuration...
@@ -540,7 +540,7 @@ RC=$?
 if test $RC != 0 ; then
     echo "Third configuration is not reported correctly."
     test $KILLSERVERS != no && kill -HUP $KILLPIDS
-    exit -1
+    exit 1
 fi
 
 echo "Adding a record unique in both domains if filtered..."
@@ -558,7 +558,7 @@ RC=$?
 if test $RC != 0 ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Adding a record unique in all domains because of filter conditions "
@@ -575,7 +575,7 @@ RC=$?
 if test $RC != 0 ; then
 	echo "spurious unique error ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Sending an empty modification"
@@ -590,7 +590,7 @@ RC=$?
 if test $RC != 0 ; then
 	echo "spurious unique error ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Making a record non-unique"
@@ -606,7 +606,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 # ITS#6641/8057/8245
@@ -623,7 +623,7 @@ RC=$?
 if test $RC != $RCODEnorelax && test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Trying to bypass uniqueness as a normal user with ManageDSAIt..."
@@ -639,7 +639,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Bypassing uniqueness as an admin user..."
@@ -688,7 +688,7 @@ RC=$?
 if test $RC != 0 ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Making the record non-unique with modrdn..."
@@ -699,7 +699,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 # ITS#6641/8057/8245
@@ -711,7 +711,7 @@ RC=$?
 if test $RC != $RCODEnorelax && test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Trying to bypass uniqueness as a normal user with a ManageDSAIt control..."
@@ -722,7 +722,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Bypassing uniqueness as an admin user..."
@@ -761,7 +761,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 #echo ----------------------
@@ -777,7 +777,7 @@ RC=$?
 if test $RC != 0 ; then
 	echo "unable to reconfigure"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Dynamically retrieving fourth configuration...
@@ -795,7 +795,7 @@ RC=$?
 if test $RC != 0 ; then
     echo "Fourth configuration is not reported correctly."
     test $KILLSERVERS != no && kill -HUP $KILLPIDS
-    exit -1
+    exit 1
 fi
 
 echo "Adding a record unique in the ignore-domain..."
@@ -814,7 +814,7 @@ RC=$?
 if test $RC != 0 ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Adding a record non-unique in the ignore-domain..."
@@ -833,7 +833,7 @@ RC=$?
 if test $RC != $RCODEconstraint ; then
 	echo "unique check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl
index 50f52ea98f..1239bd1798 100755
--- a/tests/scripts/test033-glue-syncrepl
+++ b/tests/scripts/test033-glue-syncrepl
@@ -95,7 +95,7 @@ case $RC in
 0)
 	echo "ldapadd should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 10|68)
 	# Fine if we get alreadyExists or referrals
@@ -116,7 +116,7 @@ case $RC in
 0)
 	echo "ldapadd should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 10|68)
 	# Fine if we get alreadyExists or referrals
@@ -177,7 +177,7 @@ RC=$?
 if test $RC = 0 && test $BACKEND != null ; then
 	echo "ldapsearch should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
diff --git a/tests/scripts/test035-meta b/tests/scripts/test035-meta
index 31ddd23078..d083a51e81 100755
--- a/tests/scripts/test035-meta
+++ b/tests/scripts/test035-meta
@@ -491,7 +491,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "Search should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	*)
 		echo "Search failed ($RC)!"
@@ -515,7 +515,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "Search should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	*)
 		echo "Search failed ($RC)!"
@@ -673,7 +673,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "WhoAmI should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	51,*)
 		echo "### Hit LDAP_BUSY problem; you may want to re-run the test"
@@ -698,7 +698,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "WhoAmI should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	51,*)
 		echo "### Hit LDAP_BUSY problem; you may want to re-run the test"
@@ -715,7 +715,7 @@ RC=$?
 #if test $RC != 6 ; then
 #	echo "Compare failed ($RC)!"
 #	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-#	exit -1
+#	exit 1
 #fi
 case $RC,$BACKEND in
 	6,* | 5,null)
diff --git a/tests/scripts/test041-aci b/tests/scripts/test041-aci
index 2b93397699..48ac84bdae 100755
--- a/tests/scripts/test041-aci
+++ b/tests/scripts/test041-aci
@@ -81,7 +81,7 @@ if test $RC != 32 ; then
 	echo "ldapsearch should have failed with noSuchObject ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
 	if test $RC = 0 ; then
-		exit -1
+		exit 1
 	fi
 	exit $RC
 fi
@@ -95,7 +95,7 @@ RC=$?
 if test $RC = 0 ; then
 	echo "ldapwhoami should have failed!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 # Populate ACIs
diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort
index fcb585825c..42ac7b1fc3 100755
--- a/tests/scripts/test042-valsort
+++ b/tests/scripts/test042-valsort
@@ -194,7 +194,7 @@ RC=$?
 if test $RC != 19 ; then
 	echo "valsort check failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 $LDAPSEARCH -b "$VALSORTBASEDN" -H $URI1 \
diff --git a/tests/scripts/test044-dynlist b/tests/scripts/test044-dynlist
index 25ed0abf73..689bb61d7e 100755
--- a/tests/scripts/test044-dynlist
+++ b/tests/scripts/test044-dynlist
@@ -202,7 +202,7 @@ case $RC in
 0)
 	echo "ldapcompare returned success ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapcompare failed ($RC)!"
@@ -230,7 +230,7 @@ case $RC in
 0)
 	echo "ldapcompare returned success ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapcompare failed ($RC)!"
@@ -263,7 +263,7 @@ case $RC in
 0)
 	echo "ldapcompare returned success ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapcompare failed ($RC)"
@@ -289,7 +289,7 @@ case $RC in
 0)
 	echo "ldapcompare returned success ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapcompare failed ($RC)!"
@@ -378,7 +378,7 @@ case $RC in
 0)
 	echo "ldapcompare returned success ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapcompare failed ($RC)!"
@@ -406,7 +406,7 @@ case $RC in
 0)
 	echo "ldapcompare returned success ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapcompare failed ($RC)!"
@@ -515,7 +515,7 @@ case $RC in
 0)
 	echo "ldapcompare returned success ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapcompare failed ($RC)!"
@@ -544,7 +544,7 @@ case $RC in
 0)
 	echo "ldapcompare returned success ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapcompare failed ($RC)!"
@@ -573,7 +573,7 @@ case $RC in
 0)
 	echo "ldapcompare returned success ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapcompare failed ($RC)!"
@@ -606,7 +606,7 @@ case $RC in
 0)
 	echo "ldapcompare returned success ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 *)
 	echo "ldapcompare failed ($RC)!"
diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied
index ae6dd8af6c..9c2f2ec214 100755
--- a/tests/scripts/test045-syncreplication-proxied
+++ b/tests/scripts/test045-syncreplication-proxied
@@ -143,7 +143,7 @@ case $RC in
 0 )
 	echo "ldapsearch should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 53)
 	;;
diff --git a/tests/scripts/test046-dds b/tests/scripts/test046-dds
index ed08ad02fc..9c8cb2ebe8 100755
--- a/tests/scripts/test046-dds
+++ b/tests/scripts/test046-dds
@@ -176,7 +176,7 @@ case $RC in
 0)
 	echo "ldapadd should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 19)
 	echo "ldapadd failed ($RC)"
@@ -201,7 +201,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 65)
 	echo "ldapmodify failed ($RC)"
@@ -226,7 +226,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 65)
 	echo "ldapmodify failed ($RC)"
@@ -451,7 +451,7 @@ case $RC in
 0)
 	echo "ldapmodify should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 50)
 	echo "ldapmodify failed ($RC)"
@@ -482,7 +482,7 @@ RC=$?
 if test $RC = 0 ; then
 	echo "ldapexop should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Trying to refresh the meeting as $JAJDN (should fail)..."
@@ -493,7 +493,7 @@ RC=$?
 if test $RC = 0 ; then
 	echo "ldapexop should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo "Trying to delete the meeting as $BABSDN (should fail)..."
@@ -507,7 +507,7 @@ case $RC in
 0)
 	echo "ldapdelete should have failed ($RC)!"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 	;;
 50)
 	echo "ldapdelete failed ($RC)"
diff --git a/tests/scripts/test047-ldap b/tests/scripts/test047-ldap
index 276aeaf2a5..5804273232 100755
--- a/tests/scripts/test047-ldap
+++ b/tests/scripts/test047-ldap
@@ -491,7 +491,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "Search should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	*)
 		echo "Search failed ($RC)!"
@@ -515,7 +515,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "Search should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	*)
 		echo "Search failed ($RC)!"
@@ -686,7 +686,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "WhoAmI should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	51,*)
 		echo "### Hit LDAP_BUSY problem; you may want to re-run the test"
@@ -711,7 +711,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "WhoAmI should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	51,*)
 		echo "### Hit LDAP_BUSY problem; you may want to re-run the test"
@@ -728,7 +728,7 @@ RC=$?
 #if test $RC != 6 ; then
 #	echo "Compare failed ($RC)!"
 #	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-#	exit -1
+#	exit 1
 #fi
 case $RC,$BACKEND in
 	5,null)
diff --git a/tests/scripts/test051-config-undo b/tests/scripts/test051-config-undo
index d7e2654854..c749ccb279 100755
--- a/tests/scripts/test051-config-undo
+++ b/tests/scripts/test051-config-undo
@@ -75,7 +75,7 @@ RC=$?
 if test $RC != 80 ; then
 	echo "invalid objectclass modify allowed ($RC)"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF \
@@ -90,7 +90,7 @@ RC=$?
 if test $RC != 80 ; then
 	echo "invalid attributeType modify allowed ($RC)"
 	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit -1
+	exit 1
 fi
 
 echo Surveying the damage
@@ -105,7 +105,7 @@ RC=$?
 if test $RC != 0 ; then
     echo "schema destroyed by an unsuccessful operation"
     test $KILLSERVERS != no && kill -HUP $KILLPIDS
-    exit -1
+    exit 1
 fi
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
diff --git a/tests/scripts/test055-valregex b/tests/scripts/test055-valregex
index aba4ee56b0..21944c774f 100755
--- a/tests/scripts/test055-valregex
+++ b/tests/scripts/test055-valregex
@@ -77,7 +77,7 @@ case $RC in
 	if test $BACKEND != null ; then
 		echo "ldapmodify should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	fi
 	;;
 *)
diff --git a/tests/scripts/test073-asyncmeta b/tests/scripts/test073-asyncmeta
index 353202ac39..30fb75bc5e 100755
--- a/tests/scripts/test073-asyncmeta
+++ b/tests/scripts/test073-asyncmeta
@@ -491,7 +491,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "Search should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	*)
 		echo "Search failed ($RC)!"
@@ -515,7 +515,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "Search should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	*)
 		echo "Search failed ($RC)!"
@@ -577,7 +577,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "WhoAmI should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	51,*)
 		echo "### Hit LDAP_BUSY problem; you may want to re-run the test"
@@ -602,7 +602,7 @@ case $RC,$BACKEND in
 	0,*)
 		echo "WhoAmI should have failed ($RC)!"
 		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit -1
+		exit 1
 	;;
 	51,*)
 		echo "### Hit LDAP_BUSY problem; you may want to re-run the test"