There is no SLURPPID to kill

Test is also valid for back-hdb

diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh
index 038c7521dbb7842b937439a70b25abc057bc3c1d..6d392afccee0e778a0bea396ff7535d88907fdbe 100755 (executable)
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@@ -8,7 +8,7 @@ fi
 
 . $SRCDIR/scripts/args.sh
 
-if test "$BACKEND" != "bdb"; then
+if test "$BACKEND" != "bdb" -a "$BACKEND" != "hdb"; then
        echo "Test only valid for back-bdb"
        exit 0
 fi
@@ -82,7 +82,6 @@ RC=$?
 if test $RC != 0 ; then
        echo "ldapadd failed ($RC)!"
        kill -HUP $PID $SLAVEPID
-       kill -HUP $SLURPPID
        exit $RC
 fi
 
@@ -179,7 +178,6 @@ RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed at master ($RC)!"
        kill -HUP $PID $SLAVEPID
-       kill -HUP $SLURPPID
        exit $RC
 fi
 
@@ -191,7 +189,6 @@ RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed at slave ($RC)!"
        kill -HUP $PID $SLAVEPID
-       kill -HUP $SLURPPID
        exit $RC
 fi
 

diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index 3fab847f71c31737d2932a4b00058cf6c1671ba0..888afd3072b4c833cc20353ef096a04dbda0c76f 100755 (executable)
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -8,7 +8,7 @@ fi
 
 . $SRCDIR/scripts/args.sh
 
-if test "$BACKEND" != "bdb"; then
+if test "$BACKEND" != "bdb" -a "$BACKEND" != "hdb"; then
        echo "Test only valid for back-bdb"
        exit 0
 fi
@@ -82,7 +82,6 @@ RC=$?
 if test $RC != 0 ; then
        echo "ldapadd failed ($RC)!"
        kill -HUP $PID $SLAVEPID
-       kill -HUP $SLURPPID
        exit $RC
 fi
 
@@ -179,7 +178,6 @@ RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed at master ($RC)!"
        kill -HUP $PID $SLAVEPID
-       kill -HUP $SLURPPID
        exit $RC
 fi
 
@@ -191,7 +189,6 @@ RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed at slave ($RC)!"
        kill -HUP $PID $SLAVEPID
-       kill -HUP $SLURPPID
        exit $RC
 fi