From 1732b147555786ac922eeefbce46afc9db8001c7 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Mon, 26 Sep 2005 14:56:12 +0000 Subject: [PATCH] Add missing 'kill -HUP $KILLPIDS' statements before exit. Obey ./run -k ($KILLSERVERS = no). --- tests/scripts/test005-modrdn | 8 +++++--- tests/scripts/test023-refint | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn index 6a9d0f4690..c8154149b0 100755 --- a/tests/scripts/test005-modrdn +++ b/tests/scripts/test005-modrdn @@ -52,7 +52,7 @@ done if test $RC != 0 ; then echo "ldapsearch failed ($RC)!" - kill -HUP $PID + test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi @@ -65,7 +65,7 @@ $LDAPMODRDN -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \ RC=$? if test $RC != 0 ; then echo "ldapmodrdn failed ($RC)!" - kill -HUP $PID + test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi @@ -76,7 +76,7 @@ $LDAPMODRDN -D "$MANAGERDN" -r -h $LOCALHOST -p $PORT1 -w $PASSWD >> \ RC=$? if test $RC != 0 ; then echo "ldapmodrdn failed ($RC)!" - kill -HUP $PID + test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi @@ -200,6 +200,7 @@ RC=$? if test $RC != 0 ; then echo "ldapsearch failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi @@ -214,6 +215,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 fi diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint index 4b535b881d..6b33344e68 100755 --- a/tests/scripts/test023-refint +++ b/tests/scripts/test023-refint @@ -107,6 +107,7 @@ $CMP $SEARCHOUT $SEARCHOUT > $CMPOUT if test $? != 0 ; then echo "comparison failed - modify operations did not complete correctly" + test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi @@ -139,6 +140,7 @@ fi RC=`grep -c foster $SEARCHFLT` if test $RC != 0 ; then echo "dependent modify failed - dependents were not deleted" + test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi -- 2.39.5